summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2016-07-20 15:28:49 +0000
committerReid Kleckner <rnk@google.com>2016-07-20 15:28:49 +0000
commitbcb927ffc28aaa84c715c4e8834f515df8559aa7 (patch)
tree8895df2b711b7c173dd6947ff25a41562ea43f77
parentf14db7a933e137c7f6da11c2d90d90fc57b344ef (diff)
downloadbcm5719-llvm-bcb927ffc28aaa84c715c4e8834f515df8559aa7.tar.gz
bcm5719-llvm-bcb927ffc28aaa84c715c4e8834f515df8559aa7.zip
Try to deflake Windows/dll_host.cc test by not using repeated echo appending
llvm-svn: 276130
-rw-r--r--compiler-rt/test/asan/TestCases/Windows/dll_host.cc22
1 files changed, 12 insertions, 10 deletions
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_host.cc b/compiler-rt/test/asan/TestCases/Windows/dll_host.cc
index 5dba64926b2..6b0d18f3a6a 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_host.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_host.cc
@@ -18,18 +18,20 @@
// RUN: grep "^INTERFACE_FUNCTION.*sanitizer" %p/../../../../lib/asan/asan_win_dll_thunk.cc | grep -v define | sed -e s/.*(// | sed -e s/).*// >> %t.dll_imports
//
// Add functions interecepted in asan_malloc.win.cc and asan_win.cc.
-// RUN: echo "__asan_wrap_HeapAlloc" >> %t.dll_imports
-// RUN: echo "__asan_wrap_HeapFree" >> %t.dll_imports
-// RUN: echo "__asan_wrap_HeapReAlloc" >> %t.dll_imports
-// RUN: echo "__asan_wrap_HeapSize" >> %t.dll_imports
-// RUN: echo "__asan_wrap_CreateThread" >> %t.dll_imports
-// RUN: echo "__asan_wrap_NtWaitForWorkViaWorkerFactory" >> %t.dll_imports
-// RUN: echo "__asan_wrap_RaiseException" >> %t.dll_imports
+// RUN: grep '[I]MPORT:' %s | sed -e 's/.*[I]MPORT: //' >> %t.dll_imports
+// IMPORT: __asan_wrap_HeapAlloc
+// IMPORT: __asan_wrap_HeapFree
+// IMPORT: __asan_wrap_HeapReAlloc
+// IMPORT: __asan_wrap_HeapSize
+// IMPORT: __asan_wrap_CreateThread
+// IMPORT: __asan_wrap_NtWaitForWorkViaWorkerFactory
+// IMPORT: __asan_wrap_RaiseException
//
// The exception handlers differ in 32-bit and 64-bit, so we ignore them:
-// RUN: echo "__asan_wrap__except_handler3" >> %t.exported_wrappers
-// RUN: echo "__asan_wrap__except_handler4" >> %t.exported_wrappers
-// RUN: echo "__asan_wrap___C_specific_handler" >> %t.exported_wrappers
+// RUN: grep '[E]XPORT:' %s | sed -e 's/.*[E]XPORT: //' >> %t.exported_wrappers
+// EXPORT: __asan_wrap__except_handler3
+// EXPORT: __asan_wrap__except_handler4
+// EXPORT: __asan_wrap___C_specific_handler
//
// RUN: sort %t.dll_imports | uniq > %t.dll_imports-sorted
// RUN: sort %t.exported_wrappers | uniq > %t.exported_wrappers-sorted
OpenPOWER on IntegriCloud