[compiler-rt] r261150 - Fix PR26608: Make sanitizer_common tests more portable.

[Alexey Samsonov via llvm-commits]

Author: samsonov
Date: Wed Feb 17 15:00:50 2016
New Revision: 261150

URL: http://llvm.org/viewvc/llvm-project?rev=261150&view=rev
Log:
Fix PR26608: Make sanitizer_common tests more portable.

Modified:
    compiler-rt/trunk/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc
    compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/abort_on_error.cc
    compiler-rt/trunk/test/sanitizer_common/TestCases/options-include.cc

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc?rev=261150&r1=261149&r2=261150&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc Wed Feb 17 15:00:50 2016
@@ -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

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/abort_on_error.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/abort_on_error.cc?rev=261150&r1=261149&r2=261150&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/abort_on_error.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/abort_on_error.cc Wed Feb 17 15:00:50 2016
@@ -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.

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/options-include.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/options-include.cc?rev=261150&r1=261149&r2=261150&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/options-include.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/options-include.cc Wed Feb 17 15:00:50 2016
@@ -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