From b55a964197bdc651533377bbd0b46fa58edf9196 Mon Sep 17 00:00:00 2001 From: Teresa Johnson Date: Wed, 29 Sep 2021 19:23:08 -0700 Subject: [PATCH] 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. --- clang/test/Driver/clang_f_opts.c | 2 +- lld/test/COFF/pdb-relative-source-lines.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/test/Driver/clang_f_opts.c b/clang/test/Driver/clang_f_opts.c index 3325dc4..4b0159b 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 728667b..b72c503 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' -- 2.7.4