[llvm] f254bbf - [lit] Try to fix c981c533055e test fails under windows
Joel E. Denny via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 29 10:00:37 PDT 2023
Author: Joel E. Denny
Date: 2023-08-29T13:00:07-04:00
New Revision: f254bbf23374190c88a2b1a5f163622fbec9a936
URL: https://github.com/llvm/llvm-project/commit/f254bbf23374190c88a2b1a5f163622fbec9a936
DIFF: https://github.com/llvm/llvm-project/commit/f254bbf23374190c88a2b1a5f163622fbec9a936.diff
LOG: [lit] Try to fix c981c533055e test fails under windows
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.
Added:
Modified:
llvm/utils/lit/tests/shtest-env.py
llvm/utils/lit/tests/shtest-not.py
llvm/utils/lit/tests/shtest-output-printing.py
llvm/utils/lit/tests/shtest-shell.py
Removed:
################################################################################
diff --git a/llvm/utils/lit/tests/shtest-env.py b/llvm/utils/lit/tests/shtest-env.py
index a4775ac6688d94..e7c64e2ae8affc 100644
--- a/llvm/utils/lit/tests/shtest-env.py
+++ b/llvm/utils/lit/tests/shtest-env.py
@@ -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: {{.*}}
diff --git a/llvm/utils/lit/tests/shtest-not.py b/llvm/utils/lit/tests/shtest-not.py
index 4590b9664b8467..36cc0e60d3f3e5 100644
--- a/llvm/utils/lit/tests/shtest-not.py
+++ b/llvm/utils/lit/tests/shtest-not.py
@@ -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: {{.*}}
diff --git a/llvm/utils/lit/tests/shtest-output-printing.py b/llvm/utils/lit/tests/shtest-output-printing.py
index 3e49197520a977..427ce8f235dd05 100644
--- a/llvm/utils/lit/tests/shtest-output-printing.py
+++ b/llvm/utils/lit/tests/shtest-output-printing.py
@@ -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: --
diff --git a/llvm/utils/lit/tests/shtest-shell.py b/llvm/utils/lit/tests/shtest-shell.py
index 8ce71296c1441d..52a47f03e53e27 100644
--- a/llvm/utils/lit/tests/shtest-shell.py
+++ b/llvm/utils/lit/tests/shtest-shell.py
@@ -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
More information about the llvm-commits
mailing list