From: Ismail Donmez <ismail@i10z.com>
Date: Fri, 3 Jun 2016 17:06:52 +0000 (+0000)
Subject: Fix test for LLVM_LIBDIR_SUFFIX=64 case.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9288c531812f5c3bc6d9cb2fcda4653901fa0ea9;p=clang

Fix test for LLVM_LIBDIR_SUFFIX=64 case.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@271689 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/Driver/android-ndk-standalone.cpp b/test/Driver/android-ndk-standalone.cpp
index 8d361af94b..17febeda99 100644
--- a/test/Driver/android-ndk-standalone.cpp
+++ b/test/Driver/android-ndk-standalone.cpp
@@ -17,7 +17,7 @@
 // CHECK-NOT: "-internal-isystem" "{{.*}}/include/c++/4.9/arm-linux-androideabi/thumb"
 // CHECK: "-internal-isystem" "{{.*}}/include/c++/4.9/backward"
 // CHECK: "-internal-isystem" "{{.*}}/sysroot/usr/local/include"
-// CHECK: "-internal-isystem" "{{.*(/|\\\\)}}lib{{(/|\\\\)}}clang{{(/|\\\\)[^"]+(/|\\\\)}}include"
+// CHECK: "-internal-isystem" "{{.*(/|\\\\)}}lib{{(64)?(/|\\\\)}}clang{{(/|\\\\)[^"]+(/|\\\\)}}include"
 // CHECK: "-internal-externc-isystem" "{{.*}}/sysroot/include"
 // CHECK: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include"
 // CHECK: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
@@ -53,7 +53,7 @@
 // CHECK-ARMV7-NOT: "-internal-isystem" "{{.*}}/include/c++/4.9/arm-linux-androideabi"
 // CHECK-ARMV7: "-internal-isystem" "{{.*}}/include/c++/4.9/backward"
 // CHECK-ARMV7: "-internal-isystem" "{{.*}}/sysroot/usr/local/include"
-// CHECK-ARMV7: "-internal-isystem" "{{.*(/|\\\\)}}lib{{(/|\\\\)}}clang{{(/|\\\\)[^"]+(/|\\\\)}}include"
+// CHECK-ARMV7: "-internal-isystem" "{{.*(/|\\\\)}}lib{{(64)?(/|\\\\)}}clang{{(/|\\\\)[^"]+(/|\\\\)}}include"
 // CHECK-ARMV7: "-internal-externc-isystem" "{{.*}}/sysroot/include"
 // CHECK-ARMV7: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include"
 // CHECK-ARMV7: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
@@ -111,7 +111,7 @@
 // CHECK-THUMB-NOT: "-internal-isystem" "{{.*}}/include/c++/4.9/arm-linux-androideabi"
 // CHECK-THUMB: "-internal-isystem" "{{.*}}/include/c++/4.9/backward"
 // CHECK-THUMB: "-internal-isystem" "{{.*}}/sysroot/usr/local/include"
-// CHECK-THUMB: "-internal-isystem" "{{.*(/|\\\\)}}lib{{(/|\\\\)}}clang{{(/|\\\\)[^"]+(/|\\\\)}}include"
+// CHECK-THUMB: "-internal-isystem" "{{.*(/|\\\\)}}lib{{(64)?(/|\\\\)}}clang{{(/|\\\\)[^"]+(/|\\\\)}}include"
 // CHECK-THUMB: "-internal-externc-isystem" "{{.*}}/sysroot/include"
 // CHECK-THUMB: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include"
 // CHECK-THUMB: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
@@ -149,7 +149,7 @@
 // CHECK-ARMV7THUMB-NOT: "-internal-isystem" "{{.*}}/include/c++/4.9/arm-linux-androideabi"
 // CHECK-ARMV7THUMB: "-internal-isystem" "{{.*}}/include/c++/4.9/backward"
 // CHECK-ARMV7THUMB: "-internal-isystem" "{{.*}}/sysroot/usr/local/include"
-// CHECK-ARMV7THUMB: "-internal-isystem" "{{.*(/|\\\\)}}lib{{(/|\\\\)}}clang{{(/|\\\\)[^"]+(/|\\\\)}}include"
+// CHECK-ARMV7THUMB: "-internal-isystem" "{{.*(/|\\\\)}}lib{{(64)?(/|\\\\)}}clang{{(/|\\\\)[^"]+(/|\\\\)}}include"
 // CHECK-ARMV7THUMB: "-internal-externc-isystem" "{{.*}}/sysroot/include"
 // CHECK-ARMV7THUMB: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include"
 // CHECK-ARMV7THUMB: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"