diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/test/ARCMT/whitelisted/header1.h | 2 | ||||
| -rw-r--r-- | clang/test/ARCMT/whitelisted/header1.h.result | 2 | ||||
| -rw-r--r-- | clang/test/ARCMT/whitelisted/header2.h | 3 | ||||
| -rw-r--r-- | clang/test/ARCMT/whitelisted/header2.h.result | 3 | ||||
| -rw-r--r-- | clang/test/ARCMT/whitelisted/objcmt-with-whitelist.m | 4 |
5 files changed, 12 insertions, 2 deletions
diff --git a/clang/test/ARCMT/whitelisted/header1.h b/clang/test/ARCMT/whitelisted/header1.h index d94b9f7d9eb..33f77aa5dd1 100644 --- a/clang/test/ARCMT/whitelisted/header1.h +++ b/clang/test/ARCMT/whitelisted/header1.h @@ -4,3 +4,5 @@ -(void)setProp:(int)p; +(id)i1; @end + +typedef long NSInteger; diff --git a/clang/test/ARCMT/whitelisted/header1.h.result b/clang/test/ARCMT/whitelisted/header1.h.result index 65cbd2621f6..c7cf109a27e 100644 --- a/clang/test/ARCMT/whitelisted/header1.h.result +++ b/clang/test/ARCMT/whitelisted/header1.h.result @@ -3,3 +3,5 @@ @property (nonatomic) int prop; +(instancetype)i1; @end + +typedef long NSInteger; diff --git a/clang/test/ARCMT/whitelisted/header2.h b/clang/test/ARCMT/whitelisted/header2.h index c7577ede4a4..ac3888ccdf8 100644 --- a/clang/test/ARCMT/whitelisted/header2.h +++ b/clang/test/ARCMT/whitelisted/header2.h @@ -1,4 +1,7 @@ +#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type +typedef enum : NSInteger {five} ApplicableEnum; + @interface I2 : NSObject -(int)prop; -(void)setProp:(int)p; diff --git a/clang/test/ARCMT/whitelisted/header2.h.result b/clang/test/ARCMT/whitelisted/header2.h.result index b1b52707118..3226e711b98 100644 --- a/clang/test/ARCMT/whitelisted/header2.h.result +++ b/clang/test/ARCMT/whitelisted/header2.h.result @@ -1,4 +1,7 @@ +#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type +typedef NS_ENUM(NSInteger, ApplicableEnum) {five}; + @interface I2 : NSObject @property (nonatomic) int prop; @end diff --git a/clang/test/ARCMT/whitelisted/objcmt-with-whitelist.m b/clang/test/ARCMT/whitelisted/objcmt-with-whitelist.m index bef82c8667d..0ea714fe593 100644 --- a/clang/test/ARCMT/whitelisted/objcmt-with-whitelist.m +++ b/clang/test/ARCMT/whitelisted/objcmt-with-whitelist.m @@ -1,7 +1,7 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -objcmt-migrate-readwrite-property -objcmt-migrate-instancetype %s -triple x86_64-apple-darwin11 -migrate -o %t.remap +// RUN: %clang_cc1 -objcmt-migrate-readwrite-property -objcmt-migrate-instancetype -objcmt-migrate-ns-macros %s -triple x86_64-apple-darwin11 -migrate -o %t.remap // RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %S/header1.h.result %S/header2.h.result -// RUN: %clang_cc1 -objcmt-migrate-readwrite-property -objcmt-migrate-instancetype -objcmt-white-list-dir-path=%S/Inputs %s -triple x86_64-apple-darwin11 -migrate -o %t.remap +// RUN: %clang_cc1 -objcmt-migrate-readwrite-property -objcmt-migrate-instancetype -objcmt-migrate-ns-macros -objcmt-white-list-dir-path=%S/Inputs %s -triple x86_64-apple-darwin11 -migrate -o %t.remap // RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %S/header1.h.result @interface NSObject |
