Author: probinson
Date: Sat Jun 18 20:14:35 2016
New Revision: 273102
URL: http://llvm.org/viewvc/llvm-project?rev=273102&view=rev
Log:
Revert "Make test less sensitive to the resource directory."
Will need to try this on an actual Windows system.
Modified:
cfe/trunk/test/Driver/windows-cross.c
Modified: cfe/trunk/test/Driver/windows-cross.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/windows-cross.c?rev=273102&r1=273101&r2=273102&view=diff
==============================================================================
--- cfe/trunk/test/Driver/windows-cross.c (original)
+++ cfe/trunk/test/Driver/windows-cross.c Sat Jun 18 20:14:35 2016
@@ -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"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
