aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2016-02-17 21:00:50 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2016-02-17 21:00:50 +0000
commit51a8de9f7af7930fb4a865e48ee0875cac7c1404 (patch)
tree12db8cf5a090ac5da626a6333473ce5cb5e6339d
parent57e1a3e6eed86f689ef8f4bcdbdfda2bd7f52c4d (diff)
downloadllvm-51a8de9f7af7930fb4a865e48ee0875cac7c1404.zip
llvm-51a8de9f7af7930fb4a865e48ee0875cac7c1404.tar.gz
llvm-51a8de9f7af7930fb4a865e48ee0875cac7c1404.tar.bz2
Fix PR26608: Make sanitizer_common tests more portable.
llvm-svn: 261150
-rw-r--r--compiler-rt/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc2
-rw-r--r--compiler-rt/test/sanitizer_common/TestCases/Linux/abort_on_error.cc2
-rw-r--r--compiler-rt/test/sanitizer_common/TestCases/options-include.cc7
3 files changed, 6 insertions, 5 deletions
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc b/compiler-rt/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc
index dbab525..e73f669 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc
@@ -4,7 +4,7 @@
// RUN: %clangxx %s -o %t
// Intentionally don't inherit the default options.
-// RUN: %tool_options='' not --crash %run %t 2>&1
+// RUN: env %tool_options='' not --crash %run %t 2>&1
// When we use lit's default options, we shouldn't crash.
// RUN: not %run %t 2>&1
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/abort_on_error.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/abort_on_error.cc
index 7e444c2..a5ef665 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/abort_on_error.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/abort_on_error.cc
@@ -4,7 +4,7 @@
// RUN: %clangxx %s -o %t
// Intentionally don't inherit the default options.
-// RUN: %tool_options='' not %run %t 2>&1
+// RUN: env %tool_options='' not %run %t 2>&1
// When we use lit's default options, we shouldn't crash either. On Linux
// lit doesn't set options anyway.
diff --git a/compiler-rt/test/sanitizer_common/TestCases/options-include.cc b/compiler-rt/test/sanitizer_common/TestCases/options-include.cc
index 1528b15..5b0b6d5 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/options-include.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/options-include.cc
@@ -1,9 +1,10 @@
// RUN: %clangxx -O0 %s -o %t
// Recursive include: options1 includes options2
-// RUN: echo -e "symbolize=1\ninclude='%t.options2.txt'" >%t.options1.txt
-// RUN: echo -e "help=1\n" >%t.options2.txt
-// RUN: echo -e "help=1\n" >%t.options.options-include.cc.tmp
+// RUN: echo "symbolize=1" > %t.options1.txt
+// RUN: echo "include='%t.options2.txt'" >>%t.options1.txt
+// RUN: echo "help=1" >%t.options2.txt
+// RUN: echo "help=1" >%t.options.options-include.cc.tmp
// RUN: cat %t.options1.txt
// RUN: cat %t.options2.txt