From 51a8de9f7af7930fb4a865e48ee0875cac7c1404 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Wed, 17 Feb 2016 21:00:50 +0000 Subject: [PATCH] Fix PR26608: Make sanitizer_common tests more portable. llvm-svn: 261150 --- .../test/sanitizer_common/TestCases/Darwin/abort_on_error.cc | 2 +- .../test/sanitizer_common/TestCases/Linux/abort_on_error.cc | 2 +- compiler-rt/test/sanitizer_common/TestCases/options-include.cc | 7 ++++--- 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 7e444c21..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 -- 2.7.4