Skip to content

Commit 629a182

Browse files
authored
Full path names are used in several unittests instead of the binary name. Fix up the testcase failures (#107974)
Encountered several testcase failures when running `ninja check-all`. It was due to the full path name were shown in the error message instead of the binary name, and therefore causing the check string mismatch. The machine was running CentOS 9 with binfmt_misc setup that uses qemu-aarch64 (8.1.2). Built and ran the unittest as aarch64 host (through qemu user). Co-authored-by: h2h <[email protected]>
1 parent 266154a commit 629a182

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

clang-tools-extra/clangd/test/log.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# RUN: env CLANGD_FLAGS=-compile-commands-dir=no-such-dir not clangd -lit-test </dev/null 2>&1 >/dev/null | FileCheck %s
22
CHECK: I[{{.*}}]{{.*}} clangd version {{.*}}
33
CHECK: Working directory: {{.*}}
4-
CHECK: argv[0]: clangd
4+
CHECK: argv[0]: {{.*}}clangd
55
CHECK: argv[1]: -lit-test
66
CHECK: CLANGD_FLAGS: -compile-commands-dir=no-such-dir
77
CHECK: E[{{.*}}] Path specified by --compile-commands-dir does not exist.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// RUN: not clang-query --invalid-arg 2>&1 | FileCheck %s
22

3-
// CHECK: error: clang-query{{(\.exe)?}}: Unknown command line argument '--invalid-arg'. Try: 'clang-query{{(\.exe)?}} --help'
3+
// CHECK: error: clang-query{{(\.exe)?}}: Unknown command line argument '--invalid-arg'. Try: '{{.*}}clang-query{{(\.exe)?}} --help'
44
// CHECK-NEXT: clang-query{{(\.exe)?}}: Did you mean '--extra-arg'?
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// RUN: not clang-tidy --invalid-arg 2>&1 | FileCheck %s
22

3-
// CHECK: error: clang-tidy{{(\.exe)?}}: Unknown command line argument '--invalid-arg'. Try: 'clang-tidy{{(\.exe)?}} --help'
3+
// CHECK: error: clang-tidy{{(\.exe)?}}: Unknown command line argument '--invalid-arg'. Try: '{{.*}}clang-tidy{{(\.exe)?}} --help'
44
// CHECK-NEXT: clang-tidy{{(\.exe)?}}: Did you mean '--extra-arg'?

llvm/utils/lit/tests/shtest-output-printing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# CHECK-NEXT: not not wc missing-file &> [[FILE:.*]] || true
2626
# CHECK-NEXT: # executed command: not not wc missing-file
2727
# CHECK-NEXT: # .---redirected output from '[[FILE]]'
28-
# CHECK-NEXT: # | wc: {{cannot open missing-file|missing-file.* No such file or directory}}
28+
# CHECK-NEXT: # | {{.*}}wc: {{cannot open missing-file|missing-file.* No such file or directory}}
2929
# CHECK-NEXT: # `-----------------------------
3030
# CHECK-NEXT: # note: command had no output on stdout or stderr
3131
# CHECK-NEXT: # error: command failed with exit status: 1

0 commit comments

Comments
 (0)