Skip to content

Commit 9f43a41

Browse files
committed
[Driver,test] Make Android runtime tests resisent to #87866 change
Suggested by YunQiang Su <[email protected]>
1 parent a5f5417 commit 9f43a41

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

clang/test/Driver/linux-ld.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
// RUN: %clang -### %s -no-pie 2>&1 \
9393
// RUN: --target=arm-linux-androideabi \
9494
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
95+
// RUN: -resource-dir=%S/Inputs/resource_dir \
9596
// RUN: --rtlib=compiler-rt \
9697
// RUN: | FileCheck --check-prefix=CHECK-LD-RT-ANDROID %s
9798
// CHECK-LD-RT-ANDROID-NOT: warning:
@@ -262,6 +263,7 @@
262263
// RUN: %clang -static -### %s -no-pie 2>&1 \
263264
// RUN: --target=aarch64-linux-android -rtlib=platform --unwindlib=platform \
264265
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
266+
// RUN: -resource-dir=%S/Inputs/resource_dir \
265267
// RUN: | FileCheck --check-prefix=CHECK-CLANG-ANDROID-STATIC %s
266268
// CHECK-CLANG-ANDROID-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
267269
// CHECK-CLANG-ANDROID-STATIC: "--start-group" "{{[^"]*}}{{/|\\\\}}libclang_rt.builtins-aarch64-android.a" "-l:libunwind.a" "-lc" "--end-group"

clang/test/Driver/sanitizer-ld.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
// RUN: %clang -### %s 2>&1 \
178178
// RUN: --target=arm-linux-androideabi -fuse-ld=ld -fsanitize=address \
179179
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
180+
// RUN: -resource-dir=%S/Inputs/resource_dir \
180181
// RUN: | FileCheck --check-prefix=CHECK-ASAN-ANDROID %s
181182
//
182183
// CHECK-ASAN-ANDROID: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
@@ -191,6 +192,7 @@
191192
// RUN: %clang -### %s 2>&1 \
192193
// RUN: --target=arm-linux-androideabi -fuse-ld=ld -fsanitize=address \
193194
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
195+
// RUN: -resource-dir=%S/Inputs/resource_dir \
194196
// RUN: -static-libsan \
195197
// RUN: | FileCheck --check-prefix=CHECK-ASAN-ANDROID-STATICLIBASAN %s
196198
//
@@ -203,6 +205,7 @@
203205
// RUN: %clang -### %s 2>&1 \
204206
// RUN: --target=arm-linux-androideabi -fuse-ld=ld -fsanitize=undefined \
205207
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
208+
// RUN: -resource-dir=%S/Inputs/resource_dir \
206209
// RUN: | FileCheck --check-prefix=CHECK-UBSAN-ANDROID %s
207210
//
208211
// CHECK-UBSAN-ANDROID: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
@@ -217,6 +220,7 @@
217220
// RUN: %clang -### %s 2>&1 \
218221
// RUN: --target=arm-linux-androideabi -fuse-ld=ld -fsanitize=undefined \
219222
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
223+
// RUN: -resource-dir=%S/Inputs/resource_dir \
220224
// RUN: -static-libsan \
221225
// RUN: | FileCheck --check-prefix=CHECK-UBSAN-ANDROID-STATICLIBASAN %s
222226
//
@@ -230,6 +234,7 @@
230234
// RUN: %clang -### %s 2>&1 \
231235
// RUN: --target=i686-linux-android -fuse-ld=ld -fsanitize=address \
232236
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
237+
// RUN: -resource-dir=%S/Inputs/resource_dir \
233238
// RUN: | FileCheck --check-prefix=CHECK-ASAN-ANDROID-X86 %s
234239
//
235240
// CHECK-ASAN-ANDROID-X86: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
@@ -252,6 +257,7 @@
252257
// RUN: %clang -### %s 2>&1 \
253258
// RUN: --target=arm-linux-androideabi -fuse-ld=ld -fsanitize=address \
254259
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
260+
// RUN: -resource-dir=%S/Inputs/resource_dir \
255261
// RUN: -shared \
256262
// RUN: | FileCheck --check-prefix=CHECK-ASAN-ANDROID-SHARED %s
257263
//

0 commit comments

Comments
 (0)