caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lit] Try to fix c981c53305 test fails under windows

Browse Source 
Failures were seen at
<https://lab.llvm.org/buildbot/#/builders/216/builds/26431>.

All but one failure is due to different shell-quoting of file names
because they contain special characters under windows.  Generalize
associated FileCheck patterns.

`llvm/utils/lit/tests/shtest-output-printing.py` fails because the
exit code was 127 instead of the expected 1.  Unfortunately, this CI
config doesn't pass `-dump-input-filter=all` to FileCheck, so we
cannot see the rest of the lit execution trace.  For now, generalize
the FileCheck pattern to accept any non-zero exit code to get past
this error.
This commit is contained in:
Joel E. Denny
2023-08-29 13:00:07 -04:00
parent b291182b3f
commit f254bbf233
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/utils/lit/tests/shtest-env.py
View File

@@ -85,7 +85,7 @@
# CHECK: FAIL: shtest-env :: env-calls-not-builtin.txt ({{[^)]*}})
# CHECK: env -u FOO BAR=3 not rm {{.+}}.no-such-file
# CHECK: # executed command: env -u FOO BAR=3 not rm {{.+}}.no-such-file
# CHECK: # executed command: env -u FOO BAR=3 not rm {{.+}}.no-such-file{{.+}}
# CHECK: # | Error: 'env' cannot call 'rm'
# CHECK: # error: command failed with exit status: {{.*}}

2
llvm/utils/lit/tests/shtest-not.py
View File

@@ -106,7 +106,7 @@
# CHECK: FAIL: shtest-not :: not-calls-env-builtin.txt {{.*}}
# CHECK: not --crash env -u FOO BAR=3 rm {{.*}}.no-such-file
# CHECK: # executed command: not --crash env -u FOO BAR=3 rm {{.*}}.no-such-file
# CHECK: # executed command: not --crash env -u FOO BAR=3 rm {{.+}}.no-such-file{{.+}}
# CHECK: # | Error: 'env' cannot call 'rm'
# CHECK: # error: command failed with exit status: {{.*}}

2
llvm/utils/lit/tests/shtest-output-printing.py
View File

@@ -8,7 +8,7 @@
# CHECK: -- Testing: {{.*}}
# CHECK: FAIL: shtest-output-printing :: basic.txt {{.*}}
# CHECK-NEXT: ***{{\**}} TEST 'shtest-output-printing :: basic.txt' FAILED ***{{\**}}
# CHECK-NEXT: Exit Code: 1
# CHECK-NEXT: Exit Code: {{[1-9][0-9]*}}
# CHECK-EMPTY:
# CHECK-NEXT: Command Output (stdout):
# CHECK-NEXT: --

20
llvm/utils/lit/tests/shtest-shell.py
View File

@@ -238,7 +238,7 @@
# CHECK-NOT: error
# CHECK: diff -u {{.*}}.foo {{.*}}.bar | FileCheck {{.*}} && false || true
# CHECK-NEXT: # executed command: diff -u {{.*}}.foo {{.*}}.bar
# CHECK-NEXT: # executed command: diff -u {{.+}}.foo{{.+}} {{.+}}.bar{{.+}}
# CHECK-NEXT: # note: command had no output on stdout or stderr
# CHECK-NEXT: # error: command failed with exit status: 1
# CHECK-NEXT: # executed command: FileCheck
@@ -253,8 +253,8 @@
# CHECK-NOT: error
# CHECK: cat {{.*}}.bar | diff -u {{.*}}.foo - && false || true
# CHECK-NEXT: # executed command: cat {{.*}}.bar
# CHECK-NEXT: # executed command: diff -u {{.*}}.foo -
# CHECK-NEXT: # executed command: cat {{.+}}.bar{{.+}}
# CHECK-NEXT: # executed command: diff -u {{.+}}.foo{{.+}} -
# CHECK-NEXT: # .---command stdout{{-*}}
# CHECK: # | @@
# CHECK-NEXT: # | -foo
@@ -264,8 +264,8 @@
# CHECK-NEXT: # executed command: true
# CHECK: cat {{.*}}.bar | diff -u - {{.*}}.foo && false || true
# CHECK-NEXT: # executed command: cat {{.*}}.bar
# CHECK-NEXT: # executed command: diff -u - {{.*}}.foo
# CHECK-NEXT: # executed command: cat {{.+}}.bar{{.+}}
# CHECK-NEXT: # executed command: diff -u - {{.+}}.foo{{.+}}
# CHECK-NEXT: # .---command stdout{{-*}}
# CHECK: # | @@
# CHECK-NEXT: # | -bar
@@ -279,8 +279,8 @@
# CHECK-NOT: error
# CHECK: cat {{.*}}.bar | diff -u {{.*}}.foo - | FileCheck {{.*}}
# CHECK-NEXT: # executed command: cat {{.*}}.bar
# CHECK-NEXT: # executed command: diff -u {{.*}}.foo -
# CHECK-NEXT: # executed command: cat {{.+}}.bar{{.+}}
# CHECK-NEXT: # executed command: diff -u {{.+}}.foo{{.+}} -
# CHECK-NEXT: note: command had no output on stdout or stderr
# CHECK-NEXT: error: command failed with exit status: 1
# CHECK-NEXT: # executed command: FileCheck
@@ -427,7 +427,7 @@
# CHECK: *** TEST 'shtest-shell :: diff-unified.txt' FAILED ***
# CHECK: diff -u {{.*}}.foo {{.*}}.bar && false || true
# CHECK-NEXT: # executed command: diff -u {{.*}}.foo {{.*}}.bar
# CHECK-NEXT: # executed command: diff -u {{.+}}.foo{{.+}} {{.+}}.bar{{.+}}
# CHECK-NEXT: # .---command stdout{{-*}}
# CHECK: # | @@ {{.*}} @@
# CHECK-NEXT: # | 3
@@ -443,7 +443,7 @@
# CHECK-NEXT: # executed command: true
# CHECK: diff -U 2 {{.*}}.foo {{.*}}.bar && false || true
# CHECK-NEXT: # executed command: diff -U 2 {{.*}}.foo {{.*}}.bar
# CHECK-NEXT: # executed command: diff -U 2 {{.+}}.foo{{.+}} {{.+}}.bar{{.+}}
# CHECK-NEXT: # .---command stdout{{-*}}
# CHECK: # | @@ {{.*}} @@
# CHECK-NEXT: # | 4
@@ -457,7 +457,7 @@
# CHECK-NEXT: # executed command: true
# CHECK: diff -U4 {{.*}}.foo {{.*}}.bar && false || true
# CHECK-NEXT: # executed command: diff -U4 {{.*}}.foo {{.*}}.bar
# CHECK-NEXT: # executed command: diff -U4 {{.+}}.foo{{.+}} {{.+}}.bar{{.+}}
# CHECK-NEXT: # .---command stdout{{-*}}
# CHECK: # | @@ {{.*}} @@
# CHECK-NEXT: # | 2