From d892178cc314a36f3184a3f7ecd8afeb4a42ea79 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Wed, 31 Jul 2013 10:02:58 +0000 Subject: [PATCH] Re-enable the cross-linux test on windows after making it tolerant of the path separator used when locating crtbegin.o. I'll watch the bots to see if there are other issues lurking here. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@187486 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Driver/cross-linux.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/test/Driver/cross-linux.c b/test/Driver/cross-linux.c index 8eea55514f..68cc8b1955 100644 --- a/test/Driver/cross-linux.c +++ b/test/Driver/cross-linux.c @@ -34,7 +34,7 @@ // CHECK-MULTI32-I386: "[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0]]/../../../../i386-unknown-linux/bin{{/|\\}}ld" // CHECK-MULTI32-I386: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]" // CHECK-MULTI32-I386: "-m" "elf_i386" -// CHECK-MULTI32-I386: "[[gcc_install]]/crtbegin.o" +// CHECK-MULTI32-I386: "[[gcc_install]]{{/|\\\\}}crtbegin.o" // CHECK-MULTI32-I386: "-L[[gcc_install]]" // CHECK-MULTI32-I386: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib/../lib32" // CHECK-MULTI32-I386: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib" @@ -51,7 +51,7 @@ // CHECK-MULTI32-X86-64: "[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0]]/../../../../i386-unknown-linux/bin{{/|\\}}ld" // CHECK-MULTI32-X86-64: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]" // CHECK-MULTI32-X86-64: "-m" "elf_x86_64" -// CHECK-MULTI32-X86-64: "[[gcc_install]]/64/crtbegin.o" +// CHECK-MULTI32-X86-64: "[[gcc_install]]/64{{/|\\\\}}crtbegin.o" // CHECK-MULTI32-X86-64: "-L[[gcc_install]]/64" // CHECK-MULTI32-X86-64: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib/../lib64" // CHECK-MULTI32-X86-64: "-L[[gcc_install]]" @@ -69,7 +69,7 @@ // CHECK-MULTI64-I386: "[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0]]/../../../../x86_64-unknown-linux/bin{{/|\\}}ld" // CHECK-MULTI64-I386: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]" // CHECK-MULTI64-I386: "-m" "elf_i386" -// CHECK-MULTI64-I386: "[[gcc_install]]/32/crtbegin.o" +// CHECK-MULTI64-I386: "[[gcc_install]]/32{{/|\\\\}}crtbegin.o" // CHECK-MULTI64-I386: "-L[[gcc_install]]/32" // CHECK-MULTI64-I386: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib/../lib32" // CHECK-MULTI64-I386: "-L[[gcc_install]]" @@ -87,13 +87,9 @@ // CHECK-MULTI64-X86-64: "[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0]]/../../../../x86_64-unknown-linux/bin{{/|\\}}ld" // CHECK-MULTI64-X86-64: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]" // CHECK-MULTI64-X86-64: "-m" "elf_x86_64" -// CHECK-MULTI64-X86-64: "[[gcc_install]]/crtbegin.o" +// CHECK-MULTI64-X86-64: "[[gcc_install]]{{/|\\\\}}crtbegin.o" // CHECK-MULTI64-X86-64: "-L[[gcc_install]]" // CHECK-MULTI64-X86-64: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib/../lib64" // CHECK-MULTI64-X86-64: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib" // CHECK-MULTI64-X86-64: "-L[[sysroot]]/lib" // CHECK-MULTI64-X86-64: "-L[[sysroot]]/usr/lib" - -// FIXME: [[gcc_install]] won't match anything on win32...investigating. -// REQUIRES: shell -// REQUIRES: shell-preserves-root -- 2.40.0