[cfe-commits] r155911 - in /cfe/trunk/test/Rewriter: objc-modern-boxing.mm rewrite-byref-in-nested-blocks.mm rewrite-modern-block-consts.mm rewrite-modern-block.mm rewrite-modern-ivar-access.mm rewrite-modern-ivars-1.mm rewrite-modern-struct-ivar.mm rewrite-rewritten-initializer.mm
NAKAMURA Takumi
geek4civic at gmail.com
Tue May 1 03:52:06 PDT 2012
Author: chapuni
Date: Tue May 1 05:52:06 2012
New Revision: 155911
URL: http://llvm.org/viewvc/llvm-project?rev=155911&view=rev
Log:
clang/test/Rewriter: Remove XFAIL and add -U__declspec to other 9 tests. mingw32 tends to define built-in __declspec.
Modified:
cfe/trunk/test/Rewriter/objc-modern-boxing.mm
cfe/trunk/test/Rewriter/rewrite-byref-in-nested-blocks.mm
cfe/trunk/test/Rewriter/rewrite-modern-block-consts.mm
cfe/trunk/test/Rewriter/rewrite-modern-block.mm
cfe/trunk/test/Rewriter/rewrite-modern-ivar-access.mm
cfe/trunk/test/Rewriter/rewrite-modern-ivars-1.mm
cfe/trunk/test/Rewriter/rewrite-modern-struct-ivar.mm
cfe/trunk/test/Rewriter/rewrite-rewritten-initializer.mm
Modified: cfe/trunk/test/Rewriter/objc-modern-boxing.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/objc-modern-boxing.mm?rev=155911&r1=155910&r2=155911&view=diff
==============================================================================
--- cfe/trunk/test/Rewriter/objc-modern-boxing.mm (original)
+++ cfe/trunk/test/Rewriter/objc-modern-boxing.mm Tue May 1 05:52:06 2012
@@ -1,11 +1,7 @@
// RUN: %clang_cc1 -E %s -o %t.mm
// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s
// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp -Wno-attributes
-
-// FIXME: It is incompatible to mingw due to __declspec.
-// See also r155278
-// XFAIL: mingw32
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp -Wno-attributes
extern char *strdup(const char *str);
extern "C" void *sel_registerName(const char *);
Modified: cfe/trunk/test/Rewriter/rewrite-byref-in-nested-blocks.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-byref-in-nested-blocks.mm?rev=155911&r1=155910&r2=155911&view=diff
==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-byref-in-nested-blocks.mm (original)
+++ cfe/trunk/test/Rewriter/rewrite-byref-in-nested-blocks.mm Tue May 1 05:52:06 2012
@@ -1,9 +1,8 @@
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-fragile-abi %s -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-modern-rw.cpp
// radar 7692350
-// XFAIL: mingw32
void f(void (^block)(void));
Modified: cfe/trunk/test/Rewriter/rewrite-modern-block-consts.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-modern-block-consts.mm?rev=155911&r1=155910&r2=155911&view=diff
==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-modern-block-consts.mm (original)
+++ cfe/trunk/test/Rewriter/rewrite-modern-block-consts.mm Tue May 1 05:52:06 2012
@@ -1,7 +1,6 @@
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"__declspec(X)=" %t-modern-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -U__declspec -D"__declspec(X)=" %t-modern-rw.cpp
// rdar:// 8243071
-// XFAIL: mingw32
void x(int y) {}
void f() {
Modified: cfe/trunk/test/Rewriter/rewrite-modern-block.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-modern-block.mm?rev=155911&r1=155910&r2=155911&view=diff
==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-modern-block.mm (original)
+++ cfe/trunk/test/Rewriter/rewrite-modern-block.mm Tue May 1 05:52:06 2012
@@ -1,7 +1,6 @@
// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
// rdar://11230308
-// XFAIL: mingw32
typedef struct {
char byte0;
Modified: cfe/trunk/test/Rewriter/rewrite-modern-ivar-access.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-modern-ivar-access.mm?rev=155911&r1=155910&r2=155911&view=diff
==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-modern-ivar-access.mm (original)
+++ cfe/trunk/test/Rewriter/rewrite-modern-ivar-access.mm Tue May 1 05:52:06 2012
@@ -1,8 +1,5 @@
// RUN: %clang_cc1 -fblocks -rewrite-objc -fms-extensions %s -o %t-rw.cpp
-// RUN: %clang_cc1 -Werror -fsyntax-only -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-
-// FIXME: It is incompatible to mingw due to __declspec.
-// XFAIL: mingw32
+// RUN: %clang_cc1 -Werror -fsyntax-only -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
struct OUTSIDE {
int i_OUTSIDE;
Modified: cfe/trunk/test/Rewriter/rewrite-modern-ivars-1.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-modern-ivars-1.mm?rev=155911&r1=155910&r2=155911&view=diff
==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-modern-ivars-1.mm (original)
+++ cfe/trunk/test/Rewriter/rewrite-modern-ivars-1.mm Tue May 1 05:52:06 2012
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
@interface NSCheapMutableString {
@private
Modified: cfe/trunk/test/Rewriter/rewrite-modern-struct-ivar.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-modern-struct-ivar.mm?rev=155911&r1=155910&r2=155911&view=diff
==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-modern-struct-ivar.mm (original)
+++ cfe/trunk/test/Rewriter/rewrite-modern-struct-ivar.mm Tue May 1 05:52:06 2012
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -E %s -o %t.mm
// RUN: %clang_cc1 -fblocks -rewrite-objc -fms-extensions %t.mm -o %t-rw.cpp
// RUN: FileCheck --input-file=%t-rw.cpp %s
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
struct S {
int i1;
Modified: cfe/trunk/test/Rewriter/rewrite-rewritten-initializer.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-rewritten-initializer.mm?rev=155911&r1=155910&r2=155911&view=diff
==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-rewritten-initializer.mm (original)
+++ cfe/trunk/test/Rewriter/rewrite-rewritten-initializer.mm Tue May 1 05:52:06 2012
@@ -1,9 +1,8 @@
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-fragile-abi %s -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-rw-modern.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw-modern.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw-modern.cpp
// radar 7669784
-// XFAIL: mingw32
typedef void * id;
void *sel_registerName(const char *);
More information about the cfe-commits
mailing list