diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2013-08-08 20:59:25 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2013-08-08 20:59:25 +0000 |
| commit | abb9de5257375dbf10c87bdbf40ecafa777a0881 (patch) | |
| tree | a0770293ed829eff05e5a4cad6f8657c74515fc8 /utils | |
| parent | 59c6b1073c48befe021de024a693bed94147120c (diff) | |
| download | llvm-abb9de5257375dbf10c87bdbf40ecafa777a0881.tar.gz llvm-abb9de5257375dbf10c87bdbf40ecafa777a0881.tar.bz2 llvm-abb9de5257375dbf10c87bdbf40ecafa777a0881.tar.xz | |
[lit] Change --show-{tests,suites} to exit after printing.
- This is a more sensible behavior than printing and also running tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188009 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/lit/lit/main.py | 5 | ||||
| -rw-r--r-- | utils/lit/tests/discovery.py | 15 |
2 files changed, 9 insertions, 11 deletions
diff --git a/utils/lit/lit/main.py b/utils/lit/lit/main.py index 5eaf725775..767fe10506 100755 --- a/utils/lit/lit/main.py +++ b/utils/lit/lit/main.py @@ -311,7 +311,10 @@ def main(builtinParameters = {}): ts_tests.sort(key = lambda test: test.path_in_suite) for test in ts_tests: print(' %s' % (test.getFullName(),)) - + + # Exit. + sys.exit(0) + # Select and order the tests. numTotalTests = len(tests) diff --git a/utils/lit/tests/discovery.py b/utils/lit/tests/discovery.py index be98c4bd78..28010894cd 100644 --- a/utils/lit/tests/discovery.py +++ b/utils/lit/tests/discovery.py @@ -1,7 +1,7 @@ # Check the basic discovery process, including a sub-suite. # # RUN: %{lit} %{inputs}/discovery \ -# RUN: -j 1 --debug --show-tests --show-suites --max-tests 0 \ +# RUN: -j 1 --debug --show-tests --show-suites \ # RUN: -v > %t.out 2> %t.err # RUN: FileCheck --check-prefix=CHECK-BASIC-OUT < %t.out %s # RUN: FileCheck --check-prefix=CHECK-BASIC-ERR < %t.err %s @@ -24,7 +24,6 @@ # CHECK-BASIC-OUT: top-level-suite :: subdir/test-three # CHECK-BASIC-OUT: top-level-suite :: test-one # CHECK-BASIC-OUT: top-level-suite :: test-two -# CHECK-BASIC-OUT: -- Testing: 0 # Check discovery when exact test names are given. @@ -32,19 +31,18 @@ # RUN: %{lit} \ # RUN: %{inputs}/discovery/subdir/test-three.py \ # RUN: %{inputs}/discovery/subsuite/test-one.txt \ -# RUN: -j 1 --show-tests --show-suites --max-tests 0 -v > %t.out +# RUN: -j 1 --show-tests --show-suites -v > %t.out # RUN: FileCheck --check-prefix=CHECK-EXACT-TEST < %t.out %s # # CHECK-EXACT-TEST: -- Available Tests -- # CHECK-EXACT-TEST: sub-suite :: test-one # CHECK-EXACT-TEST: top-level-suite :: subdir/test-three -# CHECK-EXACT-TEST: -- Testing: 0 # Check discovery when using an exec path. # # RUN: %{lit} %{inputs}/exec-discovery \ -# RUN: -j 1 --debug --show-tests --show-suites --max-tests 0 \ +# RUN: -j 1 --debug --show-tests --show-suites \ # RUN: -v > %t.out 2> %t.err # RUN: FileCheck --check-prefix=CHECK-ASEXEC-OUT < %t.out %s # RUN: FileCheck --check-prefix=CHECK-ASEXEC-ERR < %t.err %s @@ -70,7 +68,6 @@ # CHECK-ASEXEC-OUT: top-level-suite :: subdir/test-three # CHECK-ASEXEC-OUT: top-level-suite :: test-one # CHECK-ASEXEC-OUT: top-level-suite :: test-two -# CHECK-ASEXEC-OUT: -- Testing: 0 # Check discovery when exact test names are given. # @@ -78,12 +75,11 @@ # # RUN: %{lit} \ # RUN: %{inputs}/exec-discovery/subdir/test-three.py \ -# RUN: -j 1 --show-tests --show-suites --max-tests 0 -v > %t.out +# RUN: -j 1 --show-tests --show-suites -v > %t.out # RUN: FileCheck --check-prefix=CHECK-ASEXEC-EXACT-TEST < %t.out %s # # CHECK-ASEXEC-EXACT-TEST: -- Available Tests -- # CHECK-ASEXEC-EXACT-TEST: top-level-suite :: subdir/test-three -# CHECK-ASEXEC-EXACT-TEST: -- Testing: 0 # Check that we don't recurse infinitely when loading an site specific test @@ -91,7 +87,7 @@ # # RUN: %{lit} \ # RUN: %{inputs}/exec-discovery-in-tree/obj/ \ -# RUN: -j 1 --show-tests --show-suites --max-tests 0 -v > %t.out +# RUN: -j 1 --show-tests --show-suites -v > %t.out # RUN: FileCheck --check-prefix=CHECK-ASEXEC-INTREE < %t.out %s # # CHECK-ASEXEC-INTREE: exec-discovery-in-tree-suite - 1 tests @@ -99,4 +95,3 @@ # CHECK-ASEXEC-INTREE-NEXT: Exec Root : {{.*/exec-discovery-in-tree/obj$}} # CHECK-ASEXEC-INTREE-NEXT: -- Available Tests -- # CHECK-ASEXEC-INTREE-NEXT: exec-discovery-in-tree-suite :: test-one -# CHECK-ASEXEC-INTREE: -- Testing: 0 |