From: Paul Robinson <paul.robinson@sony.com>
Date: Sun, 19 Jun 2016 01:14:35 +0000 (+0000)
Subject: Revert "Make test less sensitive to the resource directory."
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a226ddd40159331321213e520da6154197d2cbc;p=clang

Revert "Make test less sensitive to the resource directory."
Will need to try this on an actual Windows system.



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

diff --git a/test/Driver/windows-cross.c b/test/Driver/windows-cross.c
index 4d9bc4e648..f14ae58415 100644
--- a/test/Driver/windows-cross.c
+++ b/test/Driver/windows-cross.c
@@ -69,8 +69,7 @@
 
 // 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: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
-// CHECK-ISYSTEM-AFTER: "-internal-isystem" "[[RESOURCE_DIR]]{{[/\\]}}include"
+// CHECK-ISYSTEM-AFTER: "-internal-isystem" "{{.*}}{{[/\\]}}clang{{[/\\]}}{{[\.0-9]+}}{{[/\\]}}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"