diff options
| author | Reid Kleckner <rnk@google.com> | 2016-07-20 15:28:49 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2016-07-20 15:28:49 +0000 |
| commit | d12ad4c522abb7baf441b00f99b3f36b01ebd309 (patch) | |
| tree | 8af7dfe1420e107e095bbfe4827a103c9e4b21d1 /test/asan/TestCases/Windows | |
| parent | 93908cb04a9e06c8b107b3f7f1d829ec28b418b9 (diff) | |
Try to deflake Windows/dll_host.cc test by not using repeated echo appending
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@276130 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/asan/TestCases/Windows')
| -rw-r--r-- | test/asan/TestCases/Windows/dll_host.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/test/asan/TestCases/Windows/dll_host.cc b/test/asan/TestCases/Windows/dll_host.cc index 5dba64926..6b0d18f3a 100644 --- a/test/asan/TestCases/Windows/dll_host.cc +++ b/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 |