Author: sgundapa
Date: Wed Dec 16 13:09:51 2015
New Revision: 255804
URL: http://llvm.org/viewvc/llvm-project?rev=255804&view=rev
Log:
Fix the failing windows clang unit tests. NFC
Some tests are missing the {{(.exe)?}} suffix on the exectables
which the FileCheck is grepping for. This will ensure, the lit tests
are clean on windows
Differential Revision: http://reviews.llvm.org/D15579
Modified:
cfe/trunk/test/Driver/mingw-useld.c
cfe/trunk/test/Driver/mips-mti-linux.c
cfe/trunk/test/Driver/myriad-toolchain.c
Modified: cfe/trunk/test/Driver/mingw-useld.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw-useld.c?rev=255804&r1=255803&r2=255804&view=diff
==============================================================================
--- cfe/trunk/test/Driver/mingw-useld.c (original)
+++ cfe/trunk/test/Driver/mingw-useld.c Wed Dec 16 13:09:51 2015
@@ -1,19 +1,19 @@
// RUN: %clang -### -target i686-pc-windows-gnu
--sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s 2>&1 | FileCheck
-check-prefix=CHECK_LD_32 %s
-// CHECK_LD_32: {{ld|ld.exe}}"
+// CHECK_LD_32: ld{{(.exe)?}}"
// CHECK_LD_32: "i386pe"
// CHECK_LD_32-NOT: "-flavor" "gnu"
// RUN: %clang -### -target i686-pc-windows-gnu
--sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s -fuse-ld=lld 2>&1 | FileCheck
-check-prefix=CHECK_LLD_32 %s
// CHECK_LLD_32-NOT: invalid linker name in argument
-// CHECK_LLD_32: lld" "-flavor" "gnu"
+// CHECK_LLD_32: lld{{(.exe)?}}" "-flavor" "gnu"
// CHECK_LLD_32: "i386pe"
// RUN: %clang -### -target x86_64-pc-windows-gnu
--sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s -fuse-ld=lld 2>&1 | FileCheck
-check-prefix=CHECK_LLD_64 %s
// CHECK_LLD_64-NOT: invalid linker name in argument
-// CHECK_LLD_64: lld" "-flavor" "gnu"
+// CHECK_LLD_64: lld{{(.exe)?}}" "-flavor" "gnu"
// CHECK_LLD_64: "i386pep"
// RUN: %clang -### -target arm-pc-windows-gnu
--sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s -fuse-ld=lld 2>&1 | FileCheck
-check-prefix=CHECK_LLD_ARM %s
// CHECK_LLD_ARM-NOT: invalid linker name in argument
-// CHECK_LLD_ARM: lld" "-flavor" "gnu"
+// CHECK_LLD_ARM: lld{{(.exe)?}}" "-flavor" "gnu"
// CHECK_LLD_ARM: "thumb2pe"
Modified: cfe/trunk/test/Driver/mips-mti-linux.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mips-mti-linux.c?rev=255804&r1=255803&r2=255804&view=diff
==============================================================================
--- cfe/trunk/test/Driver/mips-mti-linux.c (original)
+++ cfe/trunk/test/Driver/mips-mti-linux.c Wed Dec 16 13:09:51 2015
@@ -4,6 +4,7 @@
// it here to test that we are producing the correct paths/flags.
// Ideally, we'd like to have an --llvm-toolchain option similar to
// the --gcc-toolchain one.
+// REQUIRES: mips-registered-target
// = Big-endian, mips32r2, hard float
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
Modified: cfe/trunk/test/Driver/myriad-toolchain.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/myriad-toolchain.c?rev=255804&r1=255803&r2=255804&view=diff
==============================================================================
--- cfe/trunk/test/Driver/myriad-toolchain.c (original)
+++ cfe/trunk/test/Driver/myriad-toolchain.c Wed Dec 16 13:09:51 2015
@@ -38,8 +38,8 @@
// RUN: %clang -target shave-myriad -c -### %s -isystem somewhere -Icommon
-Wa,-yippee 2>&1 \
// RUN: | FileCheck %s -check-prefix=MOVICOMPILE
-// MOVICOMPILE: moviCompile" "-S" "-fno-exceptions" "-mcpu=myriad2"
"-DMYRIAD2" "-isystem" "somewhere" "-I" "common"
-// MOVICOMPILE: moviAsm" "-no6thSlotCompression" "-cv:myriad2" "-noSPrefixing"
"-a"
+// MOVICOMPILE: moviCompile{{(.exe)?}}" "-S" "-fno-exceptions" "-mcpu=myriad2"
"-DMYRIAD2" "-isystem" "somewhere" "-I" "common"
+// MOVICOMPILE: moviAsm{{(.exe)?}}" "-no6thSlotCompression" "-cv:myriad2"
"-noSPrefixing" "-a"
// MOVICOMPILE: "-yippee" "-i:somewhere" "-i:common" "-elf"
// RUN: %clang -target shave-myriad -c -### %s -DEFINE_ME -UNDEFINE_ME 2>&1 \
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
