Author: compnerd
Date: Sat Oct 25 15:49:12 2014
New Revision: 220625
URL: http://llvm.org/viewvc/llvm-project?rev=220625&view=rev
Log:
test: attempt to make test more hermetic
Add a fake linker in to a sysroot to use for testing the driver's tool
invocation. Should make the test behave similarly on all platforms. Addresses
review comments from Reid Kleckner from SVN r220546.
Added:
cfe/trunk/test/Driver/Inputs/Windows/
cfe/trunk/test/Driver/Inputs/Windows/ARM/
cfe/trunk/test/Driver/Inputs/Windows/ARM/8.1/
cfe/trunk/test/Driver/Inputs/Windows/ARM/8.1/usr/
cfe/trunk/test/Driver/Inputs/Windows/ARM/8.1/usr/bin/
cfe/trunk/test/Driver/Inputs/Windows/ARM/8.1/usr/bin/armv7-windows-itanium-ld
(with props)
Modified:
cfe/trunk/test/Driver/windows-cross.c
Added:
cfe/trunk/test/Driver/Inputs/Windows/ARM/8.1/usr/bin/armv7-windows-itanium-ld
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/Windows/ARM/8.1/usr/bin/armv7-windows-itanium-ld?rev=220625&view=auto
==============================================================================
(empty)
Propchange:
cfe/trunk/test/Driver/Inputs/Windows/ARM/8.1/usr/bin/armv7-windows-itanium-ld
------------------------------------------------------------------------------
svn:executable = *
Modified: cfe/trunk/test/Driver/windows-cross.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/windows-cross.c?rev=220625&r1=220624&r2=220625&view=diff
==============================================================================
--- cfe/trunk/test/Driver/windows-cross.c (original)
+++ cfe/trunk/test/Driver/windows-cross.c Sat Oct 25 15:49:12 2014
@@ -1,40 +1,35 @@
-// RUN: %clang -### -target armv7-windows-itanium -o /dev/null %s 2>&1 \
+// RUN: %clang -### -target armv7-windows-itanium --sysroot
%S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -o /dev/null %s
2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-BASIC
-// CHECK-BASIC: ld{{(.exe)?}}" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definitions" "-o" "{{[^"]*}}"
"/usr/lib/crtbegin.obj" "-L/usr/lib" "-L/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt"
"-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
+// CHECK-BASIC: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definitions" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt" "-lgcc"
"--as-needed" "-lgcc_s" "--no-as-needed"
-// RUN: %clang -### -target armv7-windows-itanium -rtlib=compiler-rt -o
/dev/null %s 2>&1 \
+// RUN: %clang -### -target armv7-windows-itanium --sysroot
%s/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin
-rtlib=compiler-rt -o /dev/null %s 2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-RTLIB
-// CHECK-RTLIB: ld{{(.exe)?}}" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definitions" "-o" "{{[^"]*}}"
"/usr/lib/crtbegin.obj" "-L/usr/lib" "-L/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
+// CHECK-RTLIB: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definitions" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
-// RUN: %clang -### -target armv7-windows-itanium --sysroot
/sysroot/Windows/ARM/8.1 -rtlib=compiler-rt -o /dev/null %s 2>&1 \
-// RUN: | FileCheck %s --check-prefix CHECK-SYSROOT
-
-// CHECK-SYSROOT: ld{{(.exe)?}}" "--sysroot=/sysroot/Windows/ARM/8.1" "-m"
"thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup"
"--allow-multiple-definitions" "-o" "{{[^"]*}}"
"/sysroot/Windows/ARM/8.1/usr/lib/crtbegin.obj"
"-L/sysroot/Windows/ARM/8.1/usr/lib" "-L/sysroot/Windows/ARM/8.1/usr/lib/gcc"
"{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}libclang_rt.builtins-arm.lib"
-
-// RUN: %clang -### -target armv7-windows-itanium --sysroot
/sysroot/Windows/ARM/8.1 -rtlib=compiler-rt -stdlib=libc++ -o /dev/null %s 2>&1
\
+// RUN: %clang -### -target armv7-windows-itanium --sysroot
%S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin
-rtlib=compiler-rt -stdlib=libc++ -o /dev/null %s 2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-C-LIBCXX
-// CHECK-C-LIBCXX: ld{{(.exe)?}}" "--sysroot=/sysroot/Windows/ARM/8.1" "-m"
"thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup"
"--allow-multiple-definitions" "-o" "{{[^"]*}}"
"/sysroot/Windows/ARM/8.1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
+// CHECK-C-LIBCXX: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definitions" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
-// RUN: %clangxx -### -target armv7-windows-itanium --sysroot
/sysroot/Windows/ARM/8.1 -rtlib=compiler-rt -stdlib=libc++ -o /dev/null %s 2>&1
\
+// RUN: %clangxx -### -target armv7-windows-itanium --sysroot
%S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin
-rtlib=compiler-rt -stdlib=libc++ -o /dev/null %s 2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-LIBCXX
-// CHECK-LIBCXX: ld{{(.exe)?}}" "--sysroot=/sysroot/Windows/ARM/8.1" "-m"
"thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup"
"--allow-multiple-definitions" "-o" "{{[^"]*}}"
"/sysroot/Windows/ARM/8.1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lc++" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
+// CHECK-LIBCXX: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definitions" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lc++"
"-lmsvcrt" "{{.*[\\/]}}libclang_rt.builtins-arm.lib"
-// RUN: %clang -### -target armv7-windows-itanium --sysroot
/sysroot/Windows/ARM/8.1 -shared -rtlib=compiler-rt -stdlib=libc++ -o
shared.dll %s 2>&1 \
+// RUN: %clang -### -target armv7-windows-itanium --sysroot
%S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -shared
-rtlib=compiler-rt -stdlib=libc++ -o shared.dll %s 2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-SHARED
-// CHECK-SHARED: ld{{(.exe)?}}" "--sysroot=/sysroot/Windows/ARM/8.1" "-m"
"thumb2pe" "-shared" "-Bdynamic" "--enable-auto-image-base" "--entry"
"_DllMainCRTStartup" "--allow-multiple-definitions" "-o" "shared.dll"
"--out-implib" "shared.lib" "/sysroot/Windows/ARM/8.1/usr/lib/crtbeginS.obj"
"{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}libclang_rt.builtins-arm.lib"
+// CHECK-SHARED: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic"
"--enable-auto-image-base" "--entry" "_DllMainCRTStartup"
"--allow-multiple-definitions" "-o" "shared.dll" "--out-implib" "shared.lib"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbeginS.obj" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
-// RUN: %clang -### -target armv7-windows-itanium --sysroot
/sysroot/Windows/ARM/8.1 -shared -rtlib=compiler-rt -stdlib=libc++
-nostartfiles -o shared.dll %s 2>&1 \
+// RUN: %clang -### -target armv7-windows-itanium --sysroot
%s/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -shared
-rtlib=compiler-rt -stdlib=libc++ -nostartfiles -o shared.dll %s 2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-NOSTARTFILES
-// CHECK-NOSTARTFILES: ld{{(.exe)?}}" "--sysroot=/sysroot/Windows/ARM/8.1"
"-m" "thumb2pe" "-shared" "-Bdynamic" "--enable-auto-image-base" "--entry"
"_DllMainCRTStartup" "--allow-multiple-definitions" "-o" "shared.dll"
"--out-implib" "shared.lib" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
+// CHECK-NOSTARTFILES: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic"
"--enable-auto-image-base" "--entry" "_DllMainCRTStartup"
"--allow-multiple-definitions" "-o" "shared.dll" "--out-implib" "shared.lib"
"{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}libclang_rt.builtins-arm.lib"
-// RUN: %clang -### -target armv7-windows-itanium --sysroot
/sysroot/Windows/ARM/8.1 -shared -rtlib=compiler-rt -stdlib=libc++
-nostartfiles -nodefaultlibs -o shared.dll %s 2>&1 \
+// RUN: %clang -### -target armv7-windows-itanium --sysroot
%S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -shared
-rtlib=compiler-rt -stdlib=libc++ -nostartfiles -nodefaultlibs -o shared.dll %s
2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-STANDALONE
-// CHECK-STANDALONE: ld{{(.exe)?}}" "--sysroot=/sysroot/Windows/ARM/8.1" "-m"
"thumb2pe" "-shared" "-Bdynamic" "--enable-auto-image-base" "--entry"
"_DllMainCRTStartup" "--allow-multiple-definitions" "-o" "shared.dll"
"--out-implib" "shared.lib" "{{.*}}.o"
+// CHECK-STANDALONE: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic"
"--enable-auto-image-base" "--entry" "_DllMainCRTStartup"
"--allow-multiple-definitions" "-o" "shared.dll" "--out-implib" "shared.lib"
"{{.*}}.o"
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
