r275609 - [test/objcmt] Add a follow-up test case for r275600.

[Argyrios Kyrtzidis via cfe-commits]

Author: akirtzidis
Date: Fri Jul 15 15:40:24 2016
New Revision: 275609

URL: http://llvm.org/viewvc/llvm-project?rev=275609&view=rev
Log:
[test/objcmt] Add a follow-up test case for r275600.

Modified:
    cfe/trunk/test/ARCMT/whitelisted/header1.h
    cfe/trunk/test/ARCMT/whitelisted/header1.h.result
    cfe/trunk/test/ARCMT/whitelisted/header2.h
    cfe/trunk/test/ARCMT/whitelisted/header2.h.result
    cfe/trunk/test/ARCMT/whitelisted/objcmt-with-whitelist.m

Modified: cfe/trunk/test/ARCMT/whitelisted/header1.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/whitelisted/header1.h?rev=275609&r1=275608&r2=275609&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/whitelisted/header1.h (original)
+++ cfe/trunk/test/ARCMT/whitelisted/header1.h Fri Jul 15 15:40:24 2016
@@ -4,3 +4,5 @@
 -(void)setProp:(int)p;
 +(id)i1;
 @end
+
+typedef long NSInteger;

Modified: cfe/trunk/test/ARCMT/whitelisted/header1.h.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/whitelisted/header1.h.result?rev=275609&r1=275608&r2=275609&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/whitelisted/header1.h.result (original)
+++ cfe/trunk/test/ARCMT/whitelisted/header1.h.result Fri Jul 15 15:40:24 2016
@@ -3,3 +3,5 @@
 @property (nonatomic) int prop;
 +(instancetype)i1;
 @end
+
+typedef long NSInteger;

Modified: cfe/trunk/test/ARCMT/whitelisted/header2.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/whitelisted/header2.h?rev=275609&r1=275608&r2=275609&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/whitelisted/header2.h (original)
+++ cfe/trunk/test/ARCMT/whitelisted/header2.h Fri Jul 15 15:40:24 2016
@@ -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;

Modified: cfe/trunk/test/ARCMT/whitelisted/header2.h.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/whitelisted/header2.h.result?rev=275609&r1=275608&r2=275609&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/whitelisted/header2.h.result (original)
+++ cfe/trunk/test/ARCMT/whitelisted/header2.h.result Fri Jul 15 15:40:24 2016
@@ -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

Modified: cfe/trunk/test/ARCMT/whitelisted/objcmt-with-whitelist.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/whitelisted/objcmt-with-whitelist.m?rev=275609&r1=275608&r2=275609&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/whitelisted/objcmt-with-whitelist.m (original)
+++ cfe/trunk/test/ARCMT/whitelisted/objcmt-with-whitelist.m Fri Jul 15 15:40:24 2016
@@ -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