From 4f6ee0903b02520e70679634085908955e157ab2 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Fri, 28 Mar 2014 20:45:05 +0000 Subject: [PATCH] Try to fix the cl-options.c test on ARM bots The test was failing because clang-cl changes the default triple to target MSVC-style Win32. This is kind of wonky, but hasn't been a problem until we started warning: warning: unknown platform, assuming -mfloat-abi=soft Some of the tests in cl-options.c were running with -Werror, causing them to fail. Fixing this by FileCheck-ifying those tests instead of using -Werror. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@205049 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Driver/cl-options.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/Driver/cl-options.c b/test/Driver/cl-options.c index 6bae7e6cb8..a666131173 100644 --- a/test/Driver/cl-options.c +++ b/test/Driver/cl-options.c @@ -131,8 +131,8 @@ // Ignored options. Check that we don't get "unused during compilation" errors. -// (/Zs is for syntax-only, /WX is for -Werror) -// RUN: %clang_cl /Zs /WX \ +// (/Zs is for syntax-only) +// RUN: %clang_cl /Zs \ // RUN: /analyze- \ // RUN: /errorReport:foo \ // RUN: /FS \ @@ -150,7 +150,8 @@ // RUN: /wd1234 \ // RUN: /Zc:forScope \ // RUN: /Zc:wchar_t \ -// RUN: -- %s +// RUN: -### -- %s 2>&1 | FileCheck -check-prefix=IGNORED %s +// IGNORED-NOT: argument unused during compilation // Ignored options and compile-only options are ignored for link jobs. // RUN: touch %t.obj @@ -161,7 +162,7 @@ // Support ignoring warnings about unused arguments. // RUN: %clang_cl /Abracadabra -Qunused-arguments -### -- %s 2>&1 | FileCheck -check-prefix=UNUSED %s -// UNUSED-NOT: warning +// UNUSED-NOT: argument unused during compilation // Unsupported but parsed options. Check that we don't error on them. // (/Zs is for syntax-only) @@ -256,7 +257,8 @@ // Xclang: "hellocc1" // We support -m32 and -m64. -// RUN: %clang_cl /Zs /WX -m32 -m64 -- %s +// RUN: %clang_cl /Zs /WX -m32 -m64 -### -- 2>&1 %s | FileCheck -check-prefix=MFLAGS %s +// MFLAGS-NOT: argument unused during compilation // Use -fno-rtti by default. // RUN: %clang_cl /c -### -- %s 2>&1 | FileCheck -check-prefix=NoRTTI %s -- 2.40.0