r187489 - With help from chapuni on IRC, I think this is right now. =] The issue

[Rafael Espíndola]

Thanks!

BTW, any idea why we have different quote levels in different parts of
the clang output?

On 31 July 2013 07:14, Chandler Carruth <chandlerc at gmail.com> wrote:
> Author: chandlerc
> Date: Wed Jul 31 06:14:13 2013
> New Revision: 187489
>
> URL: http://llvm.org/viewvc/llvm-project?rev=187489&view=rev
> Log:
> With help from chapuni on IRC, I think this is right now. =] The issue
> is that the command is quoted differently from the arguments. The
> command has '\' and the argument has '\\'. This is made unclear because
> FileCheck escapes the single matched '\' when it prints the contents of
> the variable, thus fooling me into thinking it had matched '\\' as
> intended. The solution is to bind the gcc_install variable in the
> argument list rather than out of the command. To do so we also have to
> be a bit more careful so that we don't get stray other things into the
> '.*' regex.
>
> Also, because of the argument difference, '\\\\' is the correct
> formulation before crtbegin, go back to that.
>
> Modified:
>     cfe/trunk/test/Driver/cross-linux.c
>
> Modified: cfe/trunk/test/Driver/cross-linux.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cross-linux.c?rev=187489&r1=187488&r2=187489&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/cross-linux.c (original)
> +++ cfe/trunk/test/Driver/cross-linux.c Wed Jul 31 06:14:13 2013
> @@ -31,10 +31,10 @@
>  // RUN:   | FileCheck --check-prefix=CHECK-MULTI32-I386 %s
>  // CHECK-MULTI32-I386: "-cc1" "-triple" "i386-unknown-linux"
>  // CHECK-MULTI32-I386: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin{{/|\\}}as" "--32"
> -// 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: "{{.*}}/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: "{{.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0}}{{/|\\}}crtbegin.o"
> +// CHECK-MULTI32-I386: "crti.o" "[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0]]{{/|\\\\}}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"
> @@ -48,10 +48,10 @@
>  // RUN:   | FileCheck --check-prefix=CHECK-MULTI32-X86-64 %s
>  // CHECK-MULTI32-X86-64: "-cc1" "-triple" "x86_64-unknown-linux"
>  // CHECK-MULTI32-X86-64: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin{{/|\\}}as" "--64"
> -// 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: "{{.*}}/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: "crti.o" "[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0]]/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]]"
> @@ -66,10 +66,10 @@
>  // RUN:   | FileCheck --check-prefix=CHECK-MULTI64-I386 %s
>  // CHECK-MULTI64-I386: "-cc1" "-triple" "i386-unknown-linux"
>  // CHECK-MULTI64-I386: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin{{/|\\}}as" "--32"
> -// 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: "{{.*}}/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: "crti.o" "[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0]]/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]]"
> @@ -84,10 +84,10 @@
>  // RUN:   | FileCheck --check-prefix=CHECK-MULTI64-X86-64 %s
>  // CHECK-MULTI64-X86-64: "-cc1" "-triple" "x86_64-unknown-linux"
>  // CHECK-MULTI64-X86-64: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin{{/|\\}}as" "--64"
> -// 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: "{{.*}}/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: "crti.o" "[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0]]{{/|\\\\}}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"
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits