r297764 - Fix arch-specific-libdir tests on Windows

[Reid Kleckner via cfe-commits]

Author: rnk
Date: Tue Mar 14 13:24:41 2017
New Revision: 297764

URL: http://llvm.org/viewvc/llvm-project?rev=297764&view=rev
Log:
Fix arch-specific-libdir tests on Windows

This is pretty horrible, but I forget if we have any better ways to
handle these backslashing issues.

Modified:
    cfe/trunk/test/Driver/arch-specific-libdir-rpath.c
    cfe/trunk/test/Driver/arch-specific-libdir.c

Modified: cfe/trunk/test/Driver/arch-specific-libdir-rpath.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/arch-specific-libdir-rpath.c?rev=297764&r1=297763&r2=297764&view=diff
==============================================================================
--- cfe/trunk/test/Driver/arch-specific-libdir-rpath.c (original)
+++ cfe/trunk/test/Driver/arch-specific-libdir-rpath.c Tue Mar 14 13:24:41 2017
@@ -76,10 +76,10 @@
 // RUN:     -frtlib-add-rpath \
 // RUN:   | FileCheck --check-prefixes=RESDIR,NO-LIBPATH,NO-RPATH %s
 //
-// RESDIR: "-resource-dir" "[[RESDIR:[^ ]*]]"
-// LIBPATH-X86_64:  -L[[RESDIR]]/lib/linux/x86_64
-// RPATH-X86_64:    "-rpath" "[[RESDIR]]/lib/linux/x86_64"
-// LIBPATH-AArch64: -L[[RESDIR]]/lib/linux/aarch64
-// RPATH-AArch64:   "-rpath" "[[RESDIR]]/lib/linux/aarch64"
-// NO-LIBPATH-NOT:  -L{{.*}}Inputs/resource_dir
-// NO-RPATH-NOT:    "-rpath" {{.*}}/Inputs/resource_dir
+// RESDIR: "-resource-dir" "[[RESDIR:[^"]*]]"
+// LIBPATH-X86_64:  -L[[RESDIR]]{{(/|\\\\)lib(/|\\\\)linux(/|\\\\)x86_64}}
+// RPATH-X86_64:    "-rpath" "[[RESDIR]]{{(/|\\\\)lib(/|\\\\)linux(/|\\\\)x86_64}}"
+// LIBPATH-AArch64: -L[[RESDIR]]{{(/|\\\\)lib(/|\\\\)linux(/|\\\\)aarch64}}
+// RPATH-AArch64:   "-rpath" "[[RESDIR]]{{(/|\\\\)lib(/|\\\\)linux(/|\\\\)aarch64}}"
+// NO-LIBPATH-NOT:  -L{{.*Inputs(/|\\\\)resource_dir}}
+// NO-RPATH-NOT:    "-rpath" {{.*(/|\\\\)Inputs(/|\\\\)resource_dir}}

Modified: cfe/trunk/test/Driver/arch-specific-libdir.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/arch-specific-libdir.c?rev=297764&r1=297763&r2=297764&view=diff
==============================================================================
--- cfe/trunk/test/Driver/arch-specific-libdir.c (original)
+++ cfe/trunk/test/Driver/arch-specific-libdir.c Tue Mar 14 13:24:41 2017
@@ -42,11 +42,11 @@
 // RUN:   | FileCheck --check-prefixes=FILEPATH,NO-ARCHDIR %s
 //
 //
-// FILEPATH: "-x" "c" "[[FILE_PATH:.*]]/{{.*}}.c"
-// ARCHDIR-i386:    -L[[FILE_PATH]]/Inputs/resource_dir_with_arch_subdir/lib/linux/i386
-// ARCHDIR-x86_64:  -L[[FILE_PATH]]/Inputs/resource_dir_with_arch_subdir/lib/linux/x86_64
-// ARCHDIR-arm:     -L[[FILE_PATH]]/Inputs/resource_dir_with_arch_subdir/lib/linux/arm
-// ARCHDIR-aarch64: -L[[FILE_PATH]]/Inputs/resource_dir_with_arch_subdir/lib/linux/aarch64
+// FILEPATH: "-x" "c" "[[FILE_PATH:.*]]{{(/|\\\\).*}}.c"
+// ARCHDIR-i386:    -L[[FILE_PATH]]{{(/|\\\\)Inputs(/|\\\\)resource_dir_with_arch_subdir(/|\\\\)lib(/|\\\\)linux(/|\\\\)i386}}
+// ARCHDIR-x86_64:  -L[[FILE_PATH]]{{(/|\\\\)Inputs(/|\\\\)resource_dir_with_arch_subdir(/|\\\\)lib(/|\\\\)linux(/|\\\\)x86_64}}
+// ARCHDIR-arm:     -L[[FILE_PATH]]{{(/|\\\\)Inputs(/|\\\\)resource_dir_with_arch_subdir(/|\\\\)lib(/|\\\\)linux(/|\\\\)arm}}
+// ARCHDIR-aarch64: -L[[FILE_PATH]]{{(/|\\\\)Inputs(/|\\\\)resource_dir_with_arch_subdir(/|\\\\)lib(/|\\\\)linux(/|\\\\)aarch64}}
 //
 // Have a stricter check for no-archdir - that the driver doesn't add any
 // subdirectory from the provided resource directory.