Skip to content

Commit a013898

Browse files
committed
Test fixups requiring functional changes
These test changes are seperated from the test changes in 0360f32 because they require various functional changes to asan. This reverts commit f54e0b4.
1 parent 4866454 commit a013898

File tree

9 files changed

+4
-25
lines changed

9 files changed

+4
-25
lines changed

compiler-rt/test/asan/TestCases/Windows/free_hook_realloc.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// FIXME: merge this with the common free_hook_realloc test when we can run
66
// common tests on Windows.
77

8-
// FIXME: Doesn't work with DLLs
9-
// XFAIL: win32-dynamic-asan
10-
118
#include <stdlib.h>
129
#include <io.h>
1310
#include <sanitizer/allocator_interface.h>

compiler-rt/test/asan/TestCases/Windows/msvc/dll_and_lib.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
// Just make sure we can link an implib into another DLL
22
// This used to fail between r212699 and r212814.
33
// RUN: %clang_cl_asan -DCONFIG=1 %s -c -Fo%t.1.obj
4-
// RUN: lld-link /nologo /DLL /OUT:%t.1.dll %t.1.obj %asan_dll_thunk
4+
// RUN: lld-link /nologo /DLL /OUT:%t.1.dll %t.1.obj %asan_lib %asan_thunk
55
// RUN: %clang_cl_asan -DCONFIG=2 %s -c -Fo%t.2.obj
6-
// RUN: lld-link /nologo /DLL /OUT:%t.2.dll %t.2.obj %t.1.lib %asan_dll_thunk
7-
// REQUIRES: asan-static-runtime
6+
// RUN: lld-link /nologo /DLL /OUT:%t.2.dll %t.2.obj %t.1.lib %asan_lib %asan_thunk
87
// REQUIRES: lld-available
98

109
#if CONFIG==1

compiler-rt/test/asan/TestCases/Windows/msvc/dll_large_function.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
// from the DLL. We simulate the large function with
44
// -mllvm -asan-instrumentation-with-call-threshold=0.
55
// RUN: %clang_cl_asan %s -c -Fo%t.obj -mllvm -asan-instrumentation-with-call-threshold=0
6-
// RUN: lld-link /nologo /DLL /OUT:%t.dll %t.obj %asan_dll_thunk
7-
// REQUIRES: asan-static-runtime
6+
// RUN: lld-link /nologo /DLL /OUT:%t.dll %t.obj %asan_lib %asan_thunk
87
// REQUIRES: lld-available
98

109
void f(long* foo, long* bar) {

compiler-rt/test/asan/TestCases/Windows/unsymbolized.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// RUN: rm -f %t.pdb
66
// RUN: %clangxx_asan -c -O2 %s -o %t.obj
7-
// RUN: lld-link /nologo /OUT:%t.exe %t.obj %asan_lib %asan_cxx_lib
7+
// RUN: lld-link /nologo /OUT:%t.exe %t.obj -defaultlib:libcmt -nodefaultlib:msvcrt -defaultlib:oldnames %asan_static_runtime_thunk %asan_lib
88
// RUN: not %run %t.exe 2>&1 | FileCheck %s
99
// REQUIRES: lld-available
1010

compiler-rt/test/asan/TestCases/debug_double_free.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
#include <stdio.h>
55
#include <stdlib.h>
66

7-
// FIXME: Doesn't work with DLLs
8-
// XFAIL: win32-dynamic-asan
9-
107
// If we use %p with MSVC, it comes out all upper case. Use %08x to get
118
// lowercase hex.
129
#ifdef _MSC_VER

compiler-rt/test/asan/TestCases/debug_report.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
#include <stdio.h>
77
#include <stdlib.h>
88

9-
// FIXME: Doesn't work with DLLs
10-
// XFAIL: win32-dynamic-asan
11-
129
int main() {
1310
// Disable stderr buffering. Needed on Windows.
1411
setvbuf(stderr, NULL, _IONBF, 0);

compiler-rt/test/asan/TestCases/default_options.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
// RUN: %clangxx_asan -O2 %s -o %t
22
// RUN: %run %t 2>&1 | FileCheck %s
33

4-
// FIXME: Doesn't work with DLLs
5-
// XFAIL: win32-dynamic-asan
6-
74
const char *kAsanDefaultOptions = "verbosity=1 help=1";
8-
95
// Required for dyld macOS 12.0+
106
#if (__APPLE__)
117
__attribute__((weak))

compiler-rt/test/asan/TestCases/on_error_callback.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// RUN: %clangxx_asan -O2 %s -o %t && not %run %t 2>&1 | FileCheck %s
22

3-
// FIXME: Doesn't work with DLLs
4-
// XFAIL: win32-dynamic-asan
5-
63
#include <stdio.h>
74
#include <stdlib.h>
85

compiler-rt/test/asan/TestCases/report_error_summary.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// RUN: %clangxx_asan -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
22

3-
// FIXME: Doesn't work with DLLs
4-
// XFAIL: win32-dynamic-asan
5-
63
#include <stdio.h>
74

85
// Required for ld64 macOS 12.0+

0 commit comments

Comments
 (0)