Author: Teresa Johnson Date: 2021-09-29T08:01:22-07:00 New Revision: 2f1b99ca67da18d858a4b070716790a8f53891d6
URL: https://github.com/llvm/llvm-project/commit/2f1b99ca67da18d858a4b070716790a8f53891d6 DIFF: https://github.com/llvm/llvm-project/commit/2f1b99ca67da18d858a4b070716790a8f53891d6.diff LOG: Use rm -f to fix Windows failures from test changes Try to address Windows flakes from d87bdc272ba47b7d9109ff5c7191454ab2ae6fcb by using 'rm -f' instead of just 'rm' as discussed in D110276. For example: http://45.33.8.238/win/46115/step_7.txt 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 2405fc9f0327e..3325dc44a8942 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 "%t.r/with spaces/clang" +// RUN: rm -f "%t.r/with spaces/clang" // 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 2a131dd39f561..728667bc43b65 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 ./lld-link +RUN: rm -f ./lld-link CHECK-LABEL: - Module: 'c:\src\pdb_lines_1_relative.obj' CHECK-NEXT: ObjFile: 'c:\src\pdb_lines_1_relative.obj' _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits