[arcmt] Make arcmt-test accept cc1 options to make it more portable and hopefully...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@133119 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/ARCMT/alloc-with-zone.m b/test/ARCMT/alloc-with-zone.m
index b8b78d1ed4261d3fa662623a11d6038315054e67..52d278ac949cf28aeef93c30210d32dc393f8a94 100644 (file)
--- a/test/ARCMT/alloc-with-zone.m
+++ b/test/ARCMT/alloc-with-zone.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/alloc-with-zone.m.result b/test/ARCMT/alloc-with-zone.m.result
index 52daed619e82110faad30a7d67d46ef890cd782d..a9977339e511926d39c262857f3d6a8774eac082 100644 (file)
--- a/test/ARCMT/alloc-with-zone.m.result
+++ b/test/ARCMT/alloc-with-zone.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/assign-prop-no-arc-runtime.m b/test/ARCMT/assign-prop-no-arc-runtime.m
index 07a5b40b6fad6bccbd61b4752353e9fe996b95a6..83c0107682d3a8cee119cb42ac3a8215d8aa75a3 100644 (file)
--- a/test/ARCMT/assign-prop-no-arc-runtime.m
+++ b/test/ARCMT/assign-prop-no-arc-runtime.m
@@ -1,9 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -fobjc-no-arc-runtime -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 > %t
-// RUN: diff %t %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -miphoneos-version-min=4.3 > %t
-// RUN: diff %t %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -mmacosx-version-min=10.6 > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/assign-prop-no-arc-runtime.m.result b/test/ARCMT/assign-prop-no-arc-runtime.m.result
index 69909f3416f2a6d4ebc9b921bc83abd24c353345..f5a33c582bdf9f3f8c1e5155f1e93efac1e0a82a 100644 (file)
--- a/test/ARCMT/assign-prop-no-arc-runtime.m.result
+++ b/test/ARCMT/assign-prop-no-arc-runtime.m.result
@@ -1,9 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -fobjc-no-arc-runtime -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 > %t
-// RUN: diff %t %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -miphoneos-version-min=4.3 > %t
-// RUN: diff %t %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -mmacosx-version-min=10.6 > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/assign-prop-with-arc-runtime.m b/test/ARCMT/assign-prop-with-arc-runtime.m
index 86f5fbb616a1b9dc0f29f11fc7d9c7fdf8776d6c..b77b61ba468a91d030c8d4b8cedcce8c91de5ac6 100644 (file)
--- a/test/ARCMT/assign-prop-with-arc-runtime.m
+++ b/test/ARCMT/assign-prop-with-arc-runtime.m
@@ -1,9 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000 > %t
-// RUN: diff %t %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -miphoneos-version-min=5.0 > %t
-// RUN: diff %t %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -mmacosx-version-min=10.7 > %t
+// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fsyntax-only %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/assign-prop-with-arc-runtime.m.result b/test/ARCMT/assign-prop-with-arc-runtime.m.result
index 59f7608278da6460388ffb1f95b7501e7422f12d..c5e5854e9afcb274e10d05e08f5db3f2b2bc7bfa 100644 (file)
--- a/test/ARCMT/assign-prop-with-arc-runtime.m.result
+++ b/test/ARCMT/assign-prop-with-arc-runtime.m.result
@@ -1,9 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000 > %t
-// RUN: diff %t %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -miphoneos-version-min=5.0 > %t
-// RUN: diff %t %s.result
-// RUN: arcmt-test --args -arch x86_64 %s -mmacosx-version-min=10.7 > %t
+// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fsyntax-only %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/atautorelease-2.m b/test/ARCMT/atautorelease-2.m
index 919e10edf23552ceab54eda58d7f94c719e5fa25..5d297722778199a89971dd38cb0559b8c16c359d 100644 (file)
--- a/test/ARCMT/atautorelease-2.m
+++ b/test/ARCMT/atautorelease-2.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 @interface NSAutoreleasePool

diff --git a/test/ARCMT/atautorelease-2.m.result b/test/ARCMT/atautorelease-2.m.result
index 7a55cb43ae0bd0fdd8c3320253e49d2153dffd1f..7bb164723e19eb0af9865c2f11db2e233946a6ae 100644 (file)
--- a/test/ARCMT/atautorelease-2.m.result
+++ b/test/ARCMT/atautorelease-2.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 @interface NSAutoreleasePool

diff --git a/test/ARCMT/atautorelease-3.m b/test/ARCMT/atautorelease-3.m
index 4498908472c35064969e3afeadfd042dbfb89320..5d71c33b6bc8a0020c257c3b2bb301ddb57fbba1 100644 (file)
--- a/test/ARCMT/atautorelease-3.m
+++ b/test/ARCMT/atautorelease-3.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 @interface NSAutoreleasePool

diff --git a/test/ARCMT/atautorelease-3.m.result b/test/ARCMT/atautorelease-3.m.result
index 51b0e570b636104b026794bd08c4762ba6bd2dd3..682118e82f28508660450e979113d966727d2ebd 100644 (file)
--- a/test/ARCMT/atautorelease-3.m.result
+++ b/test/ARCMT/atautorelease-3.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 @interface NSAutoreleasePool

diff --git a/test/ARCMT/atautorelease.m b/test/ARCMT/atautorelease.m
index fa1a24b9168a29b7c07012f71b0ea6080a6fc3fb..bdf77197a8a55313993aa570e9bd78ab03e35961 100644 (file)
--- a/test/ARCMT/atautorelease.m
+++ b/test/ARCMT/atautorelease.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/atautorelease.m.result b/test/ARCMT/atautorelease.m.result
index 8cd649aba958cd829f9fecce4be21206b1f98ff0..ccce1bd87570d4ee9599179509de7179dd2204e0 100644 (file)
--- a/test/ARCMT/atautorelease.m.result
+++ b/test/ARCMT/atautorelease.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/autoreleases.m b/test/ARCMT/autoreleases.m
index 284d92773d41add0fff409cc49dce007e31d0aea..a12db8178f7a4ca4ac37ee84c997ef1d61a2d214 100644 (file)
--- a/test/ARCMT/autoreleases.m
+++ b/test/ARCMT/autoreleases.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 typedef unsigned char BOOL;

diff --git a/test/ARCMT/autoreleases.m.result b/test/ARCMT/autoreleases.m.result
index fb2959fa90c518c22a9b2ede448ea8a64366a65e..796bfbb9d6597c3e163396b37923328167acebb7 100644 (file)
--- a/test/ARCMT/autoreleases.m.result
+++ b/test/ARCMT/autoreleases.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 typedef unsigned char BOOL;

diff --git a/test/ARCMT/cxx-checking.mm b/test/ARCMT/cxx-checking.mm
index cf47bba0c605c049840a3ebeea534d1877d8f2cc..667138c974744da3097be56f4d7229f974146cfa 100644 (file)
--- a/test/ARCMT/cxx-checking.mm
+++ b/test/ARCMT/cxx-checking.mm
@@ -1,4 +1,4 @@
-// RUN: arcmt-test -check-only -verify --args -Warc-abi  %s
+// RUN: arcmt-test -check-only -verify --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fblocks -Warc-abi  %s
 
 // Classes that have an Objective-C object pointer.
 struct HasObjectMember0 { // expected-warning{{'HasObjectMember0' cannot be shared between ARC and non-ARC code; add a copy constructor, a copy assignment operator, and a destructor to make it ABI-compatible}}

diff --git a/test/ARCMT/dealloc.m b/test/ARCMT/dealloc.m
index 6166c426fd8a911e0057808d58161be151ac7823..dac964403f27a03b4636a53dc43501163e8019ec 100644 (file)
--- a/test/ARCMT/dealloc.m
+++ b/test/ARCMT/dealloc.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 @interface A

diff --git a/test/ARCMT/dealloc.m.result b/test/ARCMT/dealloc.m.result
index 445d91a8b7d936b8257b5b172b4a55648f8c90e0..24756d25484b3b3a045b20361f5aa98ae41eb8d8 100644 (file)
--- a/test/ARCMT/dealloc.m.result
+++ b/test/ARCMT/dealloc.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 @interface A

diff --git a/test/ARCMT/init.m b/test/ARCMT/init.m
index 419288c3551294d013ddb99c3038d61c65766d7c..f0d24f60e1e3f6227dfce38d1490742fcf79c23c 100644 (file)
--- a/test/ARCMT/init.m
+++ b/test/ARCMT/init.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 @interface NSObject

diff --git a/test/ARCMT/init.m.result b/test/ARCMT/init.m.result
index 9142c37a2fdb2ffa5be02b20f572865ce6e8a2a4..4f3b4e724e2e0e9253e50224841820f4beb92e10 100644 (file)
--- a/test/ARCMT/init.m.result
+++ b/test/ARCMT/init.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 @interface NSObject

diff --git a/test/ARCMT/nonobjc-to-objc-cast.m b/test/ARCMT/nonobjc-to-objc-cast.m
index 1fbe73f3598ba8a1ffbfd0c77b25daa259c58c88..4ca47f2259fcd78a8eff649b003b89a1e1fa0452 100644 (file)
--- a/test/ARCMT/nonobjc-to-objc-cast.m
+++ b/test/ARCMT/nonobjc-to-objc-cast.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/nonobjc-to-objc-cast.m.result b/test/ARCMT/nonobjc-to-objc-cast.m.result
index 856b80f8d9e11ae3d49b26ceef5a3406b90eb69e..f7127b71927b48355e52bf39bcaef4013482ba1d 100644 (file)
--- a/test/ARCMT/nonobjc-to-objc-cast.m.result
+++ b/test/ARCMT/nonobjc-to-objc-cast.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/releases.m b/test/ARCMT/releases.m
index ddcdf93f3232e651f15f71bc58acd654762c0d45..f49cb7e7b9d96ceeb2da62624d11da4a190e2986 100644 (file)
--- a/test/ARCMT/releases.m
+++ b/test/ARCMT/releases.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fblocks -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 typedef int BOOL;

diff --git a/test/ARCMT/releases.m.result b/test/ARCMT/releases.m.result
index b502cbb91df639ce3070c1960869ad35e269e5d1..48b3ba202fcbe8e9cd2be18d8cee6d40191177da 100644 (file)
--- a/test/ARCMT/releases.m.result
+++ b/test/ARCMT/releases.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fblocks -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 typedef int BOOL;

diff --git a/test/ARCMT/remove-dealloc-method.m b/test/ARCMT/remove-dealloc-method.m
index 7689bc0a139da51723a5dd745c84445eef536afa..5c2d785ba716e895b0c05a8dc116c91f87cfd5f3 100644 (file)
--- a/test/ARCMT/remove-dealloc-method.m
+++ b/test/ARCMT/remove-dealloc-method.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #define nil ((void*) 0)

diff --git a/test/ARCMT/remove-dealloc-method.m.result b/test/ARCMT/remove-dealloc-method.m.result
index d423243a8f29beea00a1151140ff13d880d719d6..88d94e305e2e561b3d010c17e10f0353699710d2 100644 (file)
--- a/test/ARCMT/remove-dealloc-method.m.result
+++ b/test/ARCMT/remove-dealloc-method.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #define nil ((void*) 0)

diff --git a/test/ARCMT/remove-dealloc-zerouts.m b/test/ARCMT/remove-dealloc-zerouts.m
index 7bd00a361828fb028da389d90bf5bc8f3cb71b6f..3ba85f1edcab4cf3d88f9cb005e6fef196ae3670 100644 (file)
--- a/test/ARCMT/remove-dealloc-zerouts.m
+++ b/test/ARCMT/remove-dealloc-zerouts.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 @interface Foo 

diff --git a/test/ARCMT/remove-dealloc-zerouts.m.result b/test/ARCMT/remove-dealloc-zerouts.m.result
index ba93b3f088807e0274a55f6e4fac9a534a2af961..03a426df9b22116315f23e814250ccc12a83bb11 100644 (file)
--- a/test/ARCMT/remove-dealloc-zerouts.m.result
+++ b/test/ARCMT/remove-dealloc-zerouts.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 @interface Foo 

diff --git a/test/ARCMT/remove-statements.m b/test/ARCMT/remove-statements.m
index 6fb08a7cc2b90ab4a33dc1bf8c3ea506dfebc9cb..c433ec9913c166cb679ece0104f5db1e5a16848d 100644 (file)
--- a/test/ARCMT/remove-statements.m
+++ b/test/ARCMT/remove-statements.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/remove-statements.m.result b/test/ARCMT/remove-statements.m.result
index ab3390f9e831efd97abcf27d67858d417c22cbaf..9a1153e287c2bd49243f078e910378525074872f 100644 (file)
--- a/test/ARCMT/remove-statements.m.result
+++ b/test/ARCMT/remove-statements.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/retains.m b/test/ARCMT/retains.m
index c251f88682886f3a761830d240f973852541bfcd..d7938376ab85e7345851d9ec3cb2def0e42c507d 100644 (file)
--- a/test/ARCMT/retains.m
+++ b/test/ARCMT/retains.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fblocks -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/retains.m.result b/test/ARCMT/retains.m.result
index b8f625a91c45e018dabc60241449bb0c657a0ea2..a24b42c876595abba97acd49e2746a2caa5e7828 100644 (file)
--- a/test/ARCMT/retains.m.result
+++ b/test/ARCMT/retains.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fblocks -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/rewrite-block-var.m b/test/ARCMT/rewrite-block-var.m
index 70da6786c067a5f30cb380eea528212dcd88ef53..76f5d5092b2dcb6ec07f913c8876672bca12af4c 100644 (file)
--- a/test/ARCMT/rewrite-block-var.m
+++ b/test/ARCMT/rewrite-block-var.m
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000
-// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000 > %t
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
+// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fblocks -fsyntax-only %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/rewrite-block-var.m.result b/test/ARCMT/rewrite-block-var.m.result
index a37e6af5c41e55d4cfb4ecb283dff166369a5d85..ac220ad2a7c7d95c60cbed52a81b7551edefe055 100644 (file)
--- a/test/ARCMT/rewrite-block-var.m.result
+++ b/test/ARCMT/rewrite-block-var.m.result
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000
-// RUN: arcmt-test --args -arch x86_64 %s -D__IPHONE_OS_VERSION_MIN_REQUIRED=50000 > %t
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result
+// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fblocks -fsyntax-only %s > %t
 // RUN: diff %t %s.result
 
 #include "Common.h"

diff --git a/test/ARCMT/safe-arc-assign.m b/test/ARCMT/safe-arc-assign.m
index 2b8f93e51bd26aaf08324ccb179a3ef78f2997be..368c2b6639da5006eb98113c4b02362a8435ca2c 100644 (file)
--- a/test/ARCMT/safe-arc-assign.m
+++ b/test/ARCMT/safe-arc-assign.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 void test12(id collection) {

diff --git a/test/ARCMT/safe-arc-assign.m.result b/test/ARCMT/safe-arc-assign.m.result
index eac3d62eb1107405388051e9cb0b87469efe91f1..cacd1093c524430753aafc1b20d0df38270d4269 100644 (file)
--- a/test/ARCMT/safe-arc-assign.m.result
+++ b/test/ARCMT/safe-arc-assign.m.result
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result
-// RUN: arcmt-test --args -arch x86_64 %s > %t
+// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -x objective-c %s > %t
 // RUN: diff %t %s.result
 
 void test12(id collection) {

diff --git a/tools/arcmt-test/arcmt-test.cpp b/tools/arcmt-test/arcmt-test.cpp
index a5a7125f1ef5022521f94e85e0bf6812ac0d5961..baa3f568c0142d2f6dc078e91e9d1efa3de5c383 100644 (file)
--- a/tools/arcmt-test/arcmt-test.cpp
+++ b/tools/arcmt-test/arcmt-test.cpp
@@ -100,22 +100,20 @@ static bool checkForMigration(llvm::StringRef resourcesPath,
     Diags->setClient(verifyDiag);
   }
 
-  llvm::OwningPtr<CompilerInvocation> CI;
-  CI.reset(clang::createInvocationFromCommandLine(Args, Diags));
-  if (!CI)
-    return true;
+  CompilerInvocation CI;
+  CompilerInvocation::CreateFromArgs(CI, Args.begin(), Args.end(), *Diags);
 
-  if (CI->getFrontendOpts().Inputs.empty()) {
+  if (CI.getFrontendOpts().Inputs.empty()) {
     llvm::errs() << "error: no input files\n";
     return true;
   }
 
-  if (!CI->getLangOpts().ObjC1)
+  if (!CI.getLangOpts().ObjC1)
     return false;
 
-  return arcmt::checkForManualIssues(*CI,
-                                     CI->getFrontendOpts().Inputs[0].second,
-                                     CI->getFrontendOpts().Inputs[0].first,
+  return arcmt::checkForManualIssues(CI,
+                                     CI.getFrontendOpts().Inputs[0].second,
+                                     CI.getFrontendOpts().Inputs[0].first,
                                      Diags->getClient());
 }
 
@@ -141,20 +139,19 @@ static bool performTransformations(llvm::StringRef resourcesPath,
   llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
   llvm::IntrusiveRefCntPtr<Diagnostic> TopDiags(new Diagnostic(DiagID, DiagClient));
 
-  llvm::OwningPtr<CompilerInvocation> origCI;
-  origCI.reset(clang::createInvocationFromCommandLine(Args, TopDiags));
-  if (!origCI)
-    return true;
+  CompilerInvocation origCI;
+  CompilerInvocation::CreateFromArgs(origCI, Args.begin(), Args.end(),
+                                     *TopDiags);
 
-  if (origCI->getFrontendOpts().Inputs.empty()) {
+  if (origCI.getFrontendOpts().Inputs.empty()) {
     llvm::errs() << "error: no input files\n";
     return true;
   }
 
-  if (!origCI->getLangOpts().ObjC1)
+  if (!origCI.getLangOpts().ObjC1)
     return false;
 
-  MigrationProcess migration(*origCI, DiagClient);
+  MigrationProcess migration(origCI, DiagClient);
 
   std::vector<TransformFn> transforms = arcmt::getAllTransformations();
   assert(!transforms.empty());