Skip to content

Commit cf067d9

Browse files
committed
[utils] fix lit -vv alias, remove rendundant uses of '-a -v'
-vv should be the same as -v A bunch of lit tests use both -a and -v (or -vv), which was always redundant, but now results in the last option being applied, rather than -a always overriding -v.
1 parent 1481c37 commit cf067d9

14 files changed

+17
-17
lines changed

llvm/utils/lit/lit/cl_arguments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def parse_args():
189189
action=AliasAction,
190190
alias=[
191191
lambda namespace: TestOutputAction.setOutputLevel(
192-
namespace, "test_output", "all"
192+
namespace, "test_output", "failed"
193193
),
194194
],
195195
)

llvm/utils/lit/tests/per-test-coverage-by-lit-cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Test if lit_config.per_test_coverage in lit.cfg sets individual test case coverage.
22

3-
# RUN: %{lit} -a -vv -Dexecute_external=False \
3+
# RUN: %{lit} -a -Dexecute_external=False \
44
# RUN: %{inputs}/per-test-coverage-by-lit-cfg/per-test-coverage-by-lit-cfg.py | \
55
# RUN: FileCheck -DOUT=stdout %s
66

7-
# RUN: %{lit} -a -vv -Dexecute_external=True \
7+
# RUN: %{lit} -a -Dexecute_external=True \
88
# RUN: %{inputs}/per-test-coverage-by-lit-cfg/per-test-coverage-by-lit-cfg.py | \
99
# RUN: FileCheck -DOUT=stderr %s
1010

llvm/utils/lit/tests/per-test-coverage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Test LLVM_PROFILE_FILE is set when --per-test-coverage is passed to command line.
22

3-
# RUN: %{lit} -a -vv --per-test-coverage -Dexecute_external=False \
3+
# RUN: %{lit} -a --per-test-coverage -Dexecute_external=False \
44
# RUN: %{inputs}/per-test-coverage/per-test-coverage.py | \
55
# RUN: FileCheck -DOUT=stdout %s
66

7-
# RUN: %{lit} -a -vv --per-test-coverage -Dexecute_external=True \
7+
# RUN: %{lit} -a --per-test-coverage -Dexecute_external=True \
88
# RUN: %{inputs}/per-test-coverage/per-test-coverage.py | \
99
# RUN: FileCheck -DOUT=stderr %s
1010

llvm/utils/lit/tests/shtest-cat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Test the cat command.
22
#
3-
# RUN: not %{lit} -a -v %{inputs}/shtest-cat \
3+
# RUN: not %{lit} -v %{inputs}/shtest-cat \
44
# RUN: | FileCheck -match-full-lines %s
55
# END.
66

llvm/utils/lit/tests/shtest-env-negative.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Test the env command (failing tests).
22

3-
# RUN: not %{lit} -a -v %{inputs}/shtest-env-negative \
3+
# RUN: not %{lit} -v %{inputs}/shtest-env-negative \
44
# RUN: | FileCheck -match-full-lines %s
55
#
66
# END.

llvm/utils/lit/tests/shtest-env-path.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
## Tests env command for setting the PATH variable.
22

33
# The test is using /bin/sh. Limit to system known to have /bin/sh.
4-
# REQUIRES: system-linux
4+
# REQUIRES: system-linux || system-darwin
55

6-
# RUN: %{lit} -a -v %{inputs}/shtest-env-path/path.txt \
6+
# RUN: %{lit} -a %{inputs}/shtest-env-path/path.txt \
77
# RUN: | FileCheck -match-full-lines %s
88
#
99
# END.

llvm/utils/lit/tests/shtest-export.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Test the export command.
22

3-
# RUN: not %{lit} -a -v %{inputs}/shtest-export \
3+
# RUN: not %{lit} -v %{inputs}/shtest-export \
44
# RUN: | FileCheck -match-full-lines %s
55
#
66
# END.

llvm/utils/lit/tests/shtest-glob.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Tests glob pattern handling in echo command.
22

3-
# RUN: not %{lit} -a -v %{inputs}/shtest-glob \
3+
# RUN: not %{lit} -v %{inputs}/shtest-glob \
44
# RUN: | FileCheck -dump-input=fail -match-full-lines --implicit-check-not=Error: %s
55
# END.
66

llvm/utils/lit/tests/shtest-pushd-popd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Check the pushd and popd commands
22

3-
# RUN: not %{lit} -a -v %{inputs}/shtest-pushd-popd \
3+
# RUN: not %{lit} -v %{inputs}/shtest-pushd-popd \
44
# RUN: | FileCheck -match-full-lines %s
55
#
66
# END.

llvm/utils/lit/tests/shtest-readfile-external.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# ALLOW_RETRIES: 2
55

66
# UNSUPPORTED: system-windows
7-
# RUN: env LIT_USE_INTERNAL_SHELL=0 not %{lit} -a -v %{inputs}/shtest-readfile | FileCheck -match-full-lines -DTEMP_PATH=%S/Inputs/shtest-readfile/Output %s
7+
# RUN: env LIT_USE_INTERNAL_SHELL=0 not %{lit} -v %{inputs}/shtest-readfile | FileCheck -match-full-lines -DTEMP_PATH=%S/Inputs/shtest-readfile/Output %s
88

99
# CHECK: -- Testing: 5 tests{{.*}}
1010

0 commit comments

Comments
 (0)