From: Paul Robinson Date: Mon, 20 Jun 2016 14:33:49 +0000 (+0000) Subject: Make test less sensitive to the resource directory. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bb1494d2c53024acd429f0ef22ce8ee20caf9df;p=clang Make test less sensitive to the resource directory. Same tactic as linux-header-search.cpp and android-ndk-standalone.cpp. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@273158 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Driver/windows-cross.c b/test/Driver/windows-cross.c index f14ae58415..3812287c8a 100644 --- a/test/Driver/windows-cross.c +++ b/test/Driver/windows-cross.c @@ -69,7 +69,8 @@ // RUN: %clang -### -target armv7-windows-itanium -isystem-after "Windows Kits/10/Include/10.0.10586.0/ucrt" -isystem-after "Windows Kits/10/Include/10.0.10586.0/um" -isystem-after "Windows Kits/10/Include/10.0.10586.0/shared" -c %s -o /dev/null 2>&1 \ // RUN: | FileCheck %s --check-prefix CHECK-ISYSTEM-AFTER -// CHECK-ISYSTEM-AFTER: "-internal-isystem" "{{.*}}{{[/\\]}}clang{{[/\\]}}{{[\.0-9]+}}{{[/\\]}}include" +// CHECK-ISYSTEM-AFTER: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" +// CHECK-ISYSTEM-AFTER: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include" // CHECK-ISYSTEM-AFTER: "-internal-isystem" "Windows Kits{{[/\\]}}10{{[/\\]}}Include{{[/\\]}}10.0.10586.0{{[/\\]}}ucrt" // CHECK-ISYSTEM-AFTER: "-internal-isystem" "Windows Kits{{[/\\]}}10{{[/\\]}}Include{{[/\\]}}10.0.10586.0{{[/\\]}}um" // CHECK-ISYSTEM-AFTER: "-internal-isystem" "Windows Kits{{[/\\]}}10{{[/\\]}}Include{{[/\\]}}10.0.10586.0{{[/\\]}}shared"