diff options
12 files changed, 21 insertions, 21 deletions
diff --git a/compiler-rt/test/xray/TestCases/Posix/arg1-arg0-logging.cc b/compiler-rt/test/xray/TestCases/Posix/arg1-arg0-logging.cc index e7730bfa617..757f81a8bab 100644 --- a/compiler-rt/test/xray/TestCases/Posix/arg1-arg0-logging.cc +++ b/compiler-rt/test/xray/TestCases/Posix/arg1-arg0-logging.cc @@ -1,7 +1,7 @@ // Allow having both the no-arg and arg1 logging implementation live together, // and be called in the correct cases. // -// RUN: rm arg0-arg1-logging-* || true +// RUN: rm -f arg0-arg1-logging-* // RUN: %clangxx_xray -std=c++11 %s -o %t // RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_logfile_base=arg0-arg1-logging-" %run %t // diff --git a/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cc b/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cc index 25dda13fb23..a6ca0a49525 100644 --- a/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cc +++ b/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cc @@ -2,13 +2,13 @@ // using a custom logging function. // // RUN: %clangxx_xray -std=c++11 %s -o %t -// RUN: rm arg1-logger-* || true +// RUN: rm -f arg1-logger-* // RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_naive_log=true \ // RUN: xray_logfile_base=arg1-logger-" %run %t 2>&1 | FileCheck %s // // After all that, clean up the XRay log file. // -// RUN: rm arg1-logger-* || true +// RUN: rm -f arg1-logger-* // // At the time of writing, the ARM trampolines weren't written yet. // XFAIL: arm || aarch64 || mips diff --git a/compiler-rt/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc b/compiler-rt/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc index a16f627ac03..d8dd62247bf 100644 --- a/compiler-rt/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc +++ b/compiler-rt/test/xray/TestCases/Posix/arg1-logging-implicit-this.cc @@ -1,7 +1,7 @@ // Intercept the implicit 'this' argument of class member functions. // // RUN: %clangxx_xray -g -std=c++11 %s -o %t -// RUN: rm log-args-this-* || true +// RUN: rm -f log-args-this-* // RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_logfile_base=log-args-this-" %run %t // // XFAIL: FreeBSD || arm || aarch64 || mips diff --git a/compiler-rt/test/xray/TestCases/Posix/basic-filtering.cc b/compiler-rt/test/xray/TestCases/Posix/basic-filtering.cc index 5c51ef698a9..db07ef510c5 100644 --- a/compiler-rt/test/xray/TestCases/Posix/basic-filtering.cc +++ b/compiler-rt/test/xray/TestCases/Posix/basic-filtering.cc @@ -2,7 +2,7 @@ // logging implementation. // RUN: %clangxx_xray -std=c++11 %s -o %t -g -// RUN: rm basic-filtering-* || true +// RUN: rm -f basic-filtering-* // RUN: XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic verbosity=1 \ // RUN: xray_logfile_base=basic-filtering- \ // RUN: xray_naive_log_func_duration_threshold_us=1000 \ @@ -11,7 +11,7 @@ // RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t \ // RUN: "`ls basic-filtering-* | head -1`" | \ // RUN: FileCheck %s --check-prefix TRACE -// RUN: rm basic-filtering-* || true +// RUN: rm -f basic-filtering-* // // Now check support for the XRAY_BASIC_OPTIONS environment variable. // RUN: XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic verbosity=1 \ @@ -21,7 +21,7 @@ // RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t \ // RUN: "`ls basic-filtering-* | head -1`" | \ // RUN: FileCheck %s --check-prefix TRACE -// RUN: rm basic-filtering-* || true +// RUN: rm -f basic-filtering-* // // REQUIRES: x86_64-target-arch // REQUIRES: built-in-llvm-tree diff --git a/compiler-rt/test/xray/TestCases/Posix/c-test.cc b/compiler-rt/test/xray/TestCases/Posix/c-test.cc index de9b58985d7..28a7870d0f7 100644 --- a/compiler-rt/test/xray/TestCases/Posix/c-test.cc +++ b/compiler-rt/test/xray/TestCases/Posix/c-test.cc @@ -1,8 +1,8 @@ // RUN: %clang_xray -g -fxray-modes=xray-basic,xray-fdr,xray-profiling -o %t %s -// RUN: rm xray-log.c-test.* || true +// RUN: rm -f xray-log.c-test.* // RUN: XRAY_OPTIONS=patch_premain=true:verbosity=1:xray_mode=xray-basic %t \ // RUN: 2>&1 | FileCheck %s -// RUN: rm xray-log.c-test.* || true +// RUN: rm -f xray-log.c-test.* // // REQUIRES: x86_64-target-arch // REQUIRES: built-in-llvm-tree diff --git a/compiler-rt/test/xray/TestCases/Posix/fdr-mode-inmemory.cc b/compiler-rt/test/xray/TestCases/Posix/fdr-mode-inmemory.cc index db18cc45956..ff31626d777 100644 --- a/compiler-rt/test/xray/TestCases/Posix/fdr-mode-inmemory.cc +++ b/compiler-rt/test/xray/TestCases/Posix/fdr-mode-inmemory.cc @@ -1,12 +1,12 @@ // RUN: %clangxx_xray -g -std=c++11 %s -o %t -fxray-modes=xray-fdr -// RUN: rm fdr-inmemory-test-* || true +// RUN: rm -f fdr-inmemory-test-* // RUN: XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-inmemory-test- \ // RUN: verbosity=1" \ // RUN: XRAY_FDR_OPTIONS="no_file_flush=true func_duration_threshold_us=0" \ // RUN: %run %t 2>&1 | FileCheck %s // RUN: FILES=`find %T -name 'fdr-inmemory-test-*' | wc -l` // RUN: [ $FILES -eq 0 ] -// RUN: rm fdr-inmemory-test-* || true +// RUN: rm -f fdr-inmemory-test-* // // REQUIRES: x86_64-target-arch // REQUIRES: built-in-llvm-tree diff --git a/compiler-rt/test/xray/TestCases/Posix/fdr-mode.cc b/compiler-rt/test/xray/TestCases/Posix/fdr-mode.cc index 64a4642dbc1..b64c5e45ace 100644 --- a/compiler-rt/test/xray/TestCases/Posix/fdr-mode.cc +++ b/compiler-rt/test/xray/TestCases/Posix/fdr-mode.cc @@ -1,6 +1,6 @@ // RUN: %clangxx_xray -g -std=c++11 %s -o %t -// RUN: rm fdr-logging-test-* || true -// RUN: rm fdr-unwrite-test-* || true +// RUN: rm -f fdr-logging-test-* +// RUN: rm -f fdr-unwrite-test-* // RUN: XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-logging-test- \ // RUN: xray_mode=xray-fdr verbosity=1" \ // RUN: XRAY_FDR_OPTIONS="func_duration_threshold_us=0" \ diff --git a/compiler-rt/test/xray/TestCases/Posix/fdr-single-thread.cc b/compiler-rt/test/xray/TestCases/Posix/fdr-single-thread.cc index 55cdbd0623d..438d5ce0f71 100644 --- a/compiler-rt/test/xray/TestCases/Posix/fdr-single-thread.cc +++ b/compiler-rt/test/xray/TestCases/Posix/fdr-single-thread.cc @@ -1,5 +1,5 @@ // RUN: %clangxx_xray -g -std=c++11 %s -o %t -// RUN: rm fdr-logging-1thr-* || true +// RUN: rm -f fdr-logging-1thr-* // RUN: XRAY_OPTIONS=XRAY_OPTIONS="verbosity=1 patch_premain=true \ // RUN: xray_naive_log=false xray_fdr_log=true \ // RUN: xray_fdr_log_func_duration_threshold_us=0 \ diff --git a/compiler-rt/test/xray/TestCases/Posix/logging-modes.cc b/compiler-rt/test/xray/TestCases/Posix/logging-modes.cc index 26dac355480..f839ba5e5f5 100644 --- a/compiler-rt/test/xray/TestCases/Posix/logging-modes.cc +++ b/compiler-rt/test/xray/TestCases/Posix/logging-modes.cc @@ -1,6 +1,6 @@ // Check that we can install an implementation associated with a mode. // -// RUN: rm xray-log.logging-modes* || true +// RUN: rm -f xray-log.logging-modes* // RUN: %clangxx_xray -std=c++11 %s -o %t -fxray-modes=none // RUN: %run %t | FileCheck %s // diff --git a/compiler-rt/test/xray/TestCases/Posix/pic_test.cc b/compiler-rt/test/xray/TestCases/Posix/pic_test.cc index 4de1ad3d6da..93e1a6a47d3 100644 --- a/compiler-rt/test/xray/TestCases/Posix/pic_test.cc +++ b/compiler-rt/test/xray/TestCases/Posix/pic_test.cc @@ -2,12 +2,12 @@ // RUN: %clangxx_xray -fxray-instrument -std=c++11 -ffunction-sections \ // RUN: -fdata-sections -fpic -fpie -Wl,--gc-sections %s -o %t -// RUN: rm pic-test-logging-* || true +// RUN: rm -f pic-test-logging-* // RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_naive_log=true \ // RUN: xray_logfile_base=pic-test-logging-" %run %t 2>&1 | FileCheck %s // After all that, clean up the output xray log. // -// RUN: rm pic-test-logging-* || true +// RUN: rm -f pic-test-logging-* // UNSUPPORTED: target-is-mips64,target-is-mips64el diff --git a/compiler-rt/test/xray/TestCases/Posix/profiling-multi-threaded.cc b/compiler-rt/test/xray/TestCases/Posix/profiling-multi-threaded.cc index 8e9403e2d0c..f5f582ece64 100644 --- a/compiler-rt/test/xray/TestCases/Posix/profiling-multi-threaded.cc +++ b/compiler-rt/test/xray/TestCases/Posix/profiling-multi-threaded.cc @@ -3,13 +3,13 @@ // // FIXME: Make -fxray-modes=xray-profiling part of the default? // RUN: %clangxx_xray -std=c++11 %s -o %t -fxray-modes=xray-profiling -// RUN: rm xray-log.profiling-multi-* || true +// RUN: rm -f xray-log.profiling-multi-* // RUN: XRAY_OPTIONS=verbosity=1 \ // RUN: XRAY_PROFILING_OPTIONS=no_flush=1 %run %t // RUN: XRAY_OPTIONS=verbosity=1 %run %t // RUN: PROFILES=`ls xray-log.profiling-multi-* | wc -l` // RUN: [ $PROFILES -eq 1 ] -// RUN: rm xray-log.profiling-multi-* || true +// RUN: rm -f xray-log.profiling-multi-* // // UNSUPPORTED: target-is-mips64,target-is-mips64el diff --git a/compiler-rt/test/xray/TestCases/Posix/profiling-single-threaded.cc b/compiler-rt/test/xray/TestCases/Posix/profiling-single-threaded.cc index 6ce1f06a0ec..c6037c777d4 100644 --- a/compiler-rt/test/xray/TestCases/Posix/profiling-single-threaded.cc +++ b/compiler-rt/test/xray/TestCases/Posix/profiling-single-threaded.cc @@ -3,13 +3,13 @@ // // FIXME: Make -fxray-modes=xray-profiling part of the default? // RUN: %clangxx_xray -std=c++11 %s -o %t -fxray-modes=xray-profiling -// RUN: rm xray-log.profiling-single-* || true +// RUN: rm -f xray-log.profiling-single-* // RUN: XRAY_OPTIONS=verbosity=1 \ // RUN: XRAY_PROFILING_OPTIONS=no_flush=true %run %t // RUN: XRAY_OPTIONS=verbosity=1 %run %t // RUN: PROFILES=`ls xray-log.profiling-single-* | wc -l` // RUN: [ $PROFILES -eq 2 ] -// RUN: rm xray-log.profiling-single-* || true +// RUN: rm -f xray-log.profiling-single-* // // UNSUPPORTED: target-is-mips64,target-is-mips64el |
