[compiler-rt] r239768 - Revert "[ASan tests] Try to fix Windows buildbots due to r239754"

[Filipe Cabecinhas]

Author: filcab
Date: Mon Jun 15 16:49:35 2015
New Revision: 239768

URL: http://llvm.org/viewvc/llvm-project?rev=239768&view=rev
Log:
Revert "[ASan tests] Try to fix Windows buildbots due to r239754"

This reverts commit r239764 and the TestCases/Windows part of r239754.

Modified:
    compiler-rt/trunk/test/asan/TestCases/Windows/coverage-basic.cc
    compiler-rt/trunk/test/asan/TestCases/Windows/dll_stack_use_after_return.cc
    compiler-rt/trunk/test/asan/TestCases/Windows/report_globals_reload_dll.cc
    compiler-rt/trunk/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cc
    compiler-rt/trunk/test/asan/TestCases/Windows/stack_use_after_return.cc

Modified: compiler-rt/trunk/test/asan/TestCases/Windows/coverage-basic.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/coverage-basic.cc?rev=239768&r1=239767&r2=239768&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/coverage-basic.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/coverage-basic.cc Mon Jun 15 16:49:35 2015
@@ -1,7 +1,7 @@
 // RUN: rm -rf %T/coverage-basic
 // RUN: mkdir %T/coverage-basic && cd %T/coverage-basic
 // RUN: %clangxx_asan -fsanitize-coverage=func %s -o test.exe
-// RUN: env ASAN_OPTIONS=%ASAN_OPTIONS%:coverage=1 %run ./test.exe
+// RUN: env ASAN_OPTIONS=coverage=1 %run ./test.exe
 //
 // RUN: %sancov print *.sancov | FileCheck %s
 #include <stdio.h>

Modified: compiler-rt/trunk/test/asan/TestCases/Windows/dll_stack_use_after_return.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/dll_stack_use_after_return.cc?rev=239768&r1=239767&r2=239768&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/dll_stack_use_after_return.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/dll_stack_use_after_return.cc Mon Jun 15 16:49:35 2015
@@ -1,6 +1,6 @@
 // RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
-// RUN: env ASAN_OPTIONS=%ASAN_OPTIONS%:detect_stack_use_after_return=1 not %run %t %t.dll 2>&1 | FileCheck %s
+// RUN: env ASAN_OPTIONS=detect_stack_use_after_return=1 not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <malloc.h>
 

Modified: compiler-rt/trunk/test/asan/TestCases/Windows/report_globals_reload_dll.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/report_globals_reload_dll.cc?rev=239768&r1=239767&r2=239768&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/report_globals_reload_dll.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/report_globals_reload_dll.cc Mon Jun 15 16:49:35 2015
@@ -1,7 +1,7 @@
 // Make sure we can handle reloading the same DLL multiple times.
 // RUN: %clang_cl_asan -LD -O0 -DDLL %s -Fe%t.dll
 // RUN: %clang_cl_asan -O0 -DEXE %s -Fe%te.exe
-// RUN: env ASAN_OPTIONS=%ASAN_OPTIONS%:report_globals=1 %run %te.exe %t.dll 2>&1 | FileCheck %s
+// RUN: env ASAN_OPTIONS=report_globals=1 %run %te.exe %t.dll 2>&1 | FileCheck %s
 
 #include <windows.h>
 #include <stdio.h>

Modified: compiler-rt/trunk/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cc?rev=239768&r1=239767&r2=239768&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cc Mon Jun 15 16:49:35 2015
@@ -1,6 +1,6 @@
 // RUN: %clang_cl_asan -LD -O0 -DDLL %s -Fe%t.dll
 // RUN: %clang_cl_asan -O0 -DEXE %s -Fe%te.exe
-// RUN: env ASAN_OPTIONS=%ASAN_OPTIONS%:report_globals=2 %run %te.exe %t.dll 2>&1 | FileCheck %s
+// RUN: env ASAN_OPTIONS=report_globals=2 %run %te.exe %t.dll 2>&1 | FileCheck %s
 
 #include <windows.h>
 #include <stdio.h>

Modified: compiler-rt/trunk/test/asan/TestCases/Windows/stack_use_after_return.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/stack_use_after_return.cc?rev=239768&r1=239767&r2=239768&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/stack_use_after_return.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/stack_use_after_return.cc Mon Jun 15 16:49:35 2015
@@ -1,5 +1,5 @@
 // RUN: %clang_cl_asan -O0 %s -Fe%t
-// RUN: env ASAN_OPTIONS=%ASAN_OPTIONS%:detect_stack_use_after_return=1 not %run %t 2>&1 | FileCheck %s
+// RUN: env ASAN_OPTIONS=detect_stack_use_after_return=1 not %run %t 2>&1 | FileCheck %s
 
 char *x;