Skip to content

Commit 8814b6d

Browse files
authored
[clang][test] Fix some windows driver tests with legacy runtime dir layout (#108452)
With the legacy runtime directory layout, the runtime libraries are under `lib/clang/20/lib/windows` and have an arch suffix.
1 parent f02a0d0 commit 8814b6d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

clang/test/Driver/cl-link.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
// ASAN: link.exe
1414
// ASAN: "-debug"
1515
// ASAN: "-incremental:no"
16-
// ASAN: "{{[^"]*}}clang_rt.asan_dynamic.lib"
17-
// ASAN: "-wholearchive:{{.*}}clang_rt.asan_static_runtime_thunk.lib"
16+
// ASAN: "{{[^"]*}}clang_rt.asan_dynamic{{(-i386)?}}.lib"
17+
// ASAN: "-wholearchive:{{.*}}clang_rt.asan_static_runtime_thunk{{(-i386)?}}.lib"
1818
// ASAN: "{{.*}}cl-link{{.*}}.obj"
1919

2020
// RUN: %clang_cl -m32 -arch:IA32 --target=i386-pc-win32 /MD /Tc%s -fuse-ld=link -### -fsanitize=address 2>&1 | FileCheck --check-prefix=ASAN-MD %s
2121
// ASAN-MD: link.exe
2222
// ASAN-MD: "-debug"
2323
// ASAN-MD: "-incremental:no"
24-
// ASAN-MD: "{{.*}}clang_rt.asan_dynamic.lib"
24+
// ASAN-MD: "{{.*}}clang_rt.asan_dynamic{{(-i386)?}}.lib"
2525
// ASAN-MD: "-include:___asan_seh_interceptor"
26-
// ASAN-MD: "-wholearchive:{{.*}}clang_rt.asan_dynamic_runtime_thunk.lib"
26+
// ASAN-MD: "-wholearchive:{{.*}}clang_rt.asan_dynamic_runtime_thunk{{(-i386)?}}.lib"
2727
// ASAN-MD: "{{.*}}cl-link{{.*}}.obj"
2828

2929
// RUN: %clang_cl /LD -fuse-ld=link -### /Tc%s 2>&1 | FileCheck --check-prefix=DLL %s
@@ -37,8 +37,8 @@
3737
// ASAN-DLL: "-dll"
3838
// ASAN-DLL: "-debug"
3939
// ASAN-DLL: "-incremental:no"
40-
// ASAN-DLL: "{{.*}}clang_rt.asan_dynamic.lib"
41-
// ASAN-DLL: "-wholearchive:{{.*}}clang_rt.asan_static_runtime_thunk.lib"
40+
// ASAN-DLL: "{{.*}}clang_rt.asan_dynamic{{(-i386)?}}.lib"
41+
// ASAN-DLL: "-wholearchive:{{.*}}clang_rt.asan_static_runtime_thunk{{(-i386)?}}.lib"
4242
// ASAN-DLL: "{{.*}}cl-link{{.*}}.obj"
4343

4444
// RUN: %clang_cl /Zi /Tc%s -fuse-ld=link -### 2>&1 | FileCheck --check-prefix=DEBUG %s

clang/test/Driver/windows-cross.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
// RUN: | FileCheck %s --check-prefix CHECK-SANITIZE-ADDRESS-EXE-X86
6565

6666
// CHECK-SANITIZE-ADDRESS-EXE-X86: "-fsanitize=address"
67-
// CHECK-SANITIZE-ADDRESS-EXE-X86: "{{.*}}clang_rt.asan_dynamic.lib" "{{.*}}clang_rt.asan_dynamic_runtime_thunk.lib" "--undefined" "___asan_seh_interceptor"
67+
// CHECK-SANITIZE-ADDRESS-EXE-X86: "{{.*}}clang_rt.asan_dynamic{{(-i386)?}}.lib" "{{.*}}clang_rt.asan_dynamic_runtime_thunk{{(-i386)?}}.lib" "--undefined" "___asan_seh_interceptor"
6868

6969
// RUN: not %clang -### --target=armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -fuse-ld=lld-link2 -shared -o shared.dll -fsanitize=tsan -x c++ %s 2>&1 \
7070
// RUN: | FileCheck %s --check-prefix CHECK-SANITIZE-TSAN

0 commit comments

Comments
 (0)