[clang] b55a964 - Second attempt to fix Windows failures from test changes
Teresa Johnson via cfe-commits
cfe-commits at lists.llvm.org
Wed Sep 29 19:24:46 PDT 2021
Author: Teresa Johnson
Date: 2021-09-29T19:24:35-07:00
New Revision: b55a964197bdc651533377bbd0b46fa58edf9196
URL: https://github.com/llvm/llvm-project/commit/b55a964197bdc651533377bbd0b46fa58edf9196
DIFF: https://github.com/llvm/llvm-project/commit/b55a964197bdc651533377bbd0b46fa58edf9196.diff
LOG: Second attempt to fix Windows failures from test changes
Try to address Windows flakes from d87bdc272ba47b7d9109ff5c7191454ab2ae6fcb
by adding "|| true" as suggested in D110276 so the whole test doesn't
fail when Windows thinks it can't remove the binary.
Added:
Modified:
clang/test/Driver/clang_f_opts.c
lld/test/COFF/pdb-relative-source-lines.test
Removed:
################################################################################
diff --git a/clang/test/Driver/clang_f_opts.c b/clang/test/Driver/clang_f_opts.c
index 3325dc44a8942..4b0159b80f739 100644
--- a/clang/test/Driver/clang_f_opts.c
+++ b/clang/test/Driver/clang_f_opts.c
@@ -566,7 +566,7 @@
// RUN: "%t.r/with spaces/clang" -### -S -target x86_64-unknown-linux -frecord-gcc-switches %s 2>&1 | FileCheck -check-prefix=CHECK-RECORD-GCC-SWITCHES-ESCAPED %s
// CHECK-RECORD-GCC-SWITCHES-ESCAPED: "-record-command-line" "{{.+}}with\\ spaces{{.+}}"
// Clean up copy of large binary copied into temp directory to avoid bloat.
-// RUN: rm -f "%t.r/with spaces/clang"
+// RUN: rm -f "%t.r/with spaces/clang" || true
// RUN: %clang -### -S -ftrivial-auto-var-init=uninitialized %s 2>&1 | FileCheck -check-prefix=CHECK-TRIVIAL-UNINIT %s
// RUN: %clang -### -S -ftrivial-auto-var-init=pattern %s 2>&1 | FileCheck -check-prefix=CHECK-TRIVIAL-PATTERN %s
diff --git a/lld/test/COFF/pdb-relative-source-lines.test b/lld/test/COFF/pdb-relative-source-lines.test
index 728667bc43b65..b72c5036a9159 100644
--- a/lld/test/COFF/pdb-relative-source-lines.test
+++ b/lld/test/COFF/pdb-relative-source-lines.test
@@ -42,7 +42,7 @@ RUN: ./lld-link -debug -entry:main -nodefaultlib -out:out.exe -pdb:out.pdb pdb_l
RUN: llvm-pdbutil pdb2yaml -modules -module-files -module-syms -subsections=lines,fc %t/out.pdb | FileCheck --check-prefix=ABSOLUTE %s
Clean up copy of large binary copied into temp directory to avoid bloat.
-RUN: rm -f ./lld-link
+RUN: rm -f ./lld-link || true
CHECK-LABEL: - Module: 'c:\src\pdb_lines_1_relative.obj'
CHECK-NEXT: ObjFile: 'c:\src\pdb_lines_1_relative.obj'
More information about the cfe-commits
mailing list