[cfe-commits] r133119 - in /cfe/trunk: test/ARCMT/ tools/arcmt-test/

Argyrios Kyrtzidis akyrtzi at gmail.com
Wed Jun 15 17:53:47 PDT 2011


Author: akirtzidis
Date: Wed Jun 15 19:53:46 2011
New Revision: 133119

URL: http://llvm.org/viewvc/llvm-project?rev=133119&view=rev
Log:
[arcmt] Make arcmt-test accept cc1 options to make it more portable and hopefully fix MSVC failures.

Modified:
    cfe/trunk/test/ARCMT/alloc-with-zone.m
    cfe/trunk/test/ARCMT/alloc-with-zone.m.result
    cfe/trunk/test/ARCMT/assign-prop-no-arc-runtime.m
    cfe/trunk/test/ARCMT/assign-prop-no-arc-runtime.m.result
    cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m
    cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m.result
    cfe/trunk/test/ARCMT/atautorelease-2.m
    cfe/trunk/test/ARCMT/atautorelease-2.m.result
    cfe/trunk/test/ARCMT/atautorelease-3.m
    cfe/trunk/test/ARCMT/atautorelease-3.m.result
    cfe/trunk/test/ARCMT/atautorelease.m
    cfe/trunk/test/ARCMT/atautorelease.m.result
    cfe/trunk/test/ARCMT/autoreleases.m
    cfe/trunk/test/ARCMT/autoreleases.m.result
    cfe/trunk/test/ARCMT/cxx-checking.mm
    cfe/trunk/test/ARCMT/dealloc.m
    cfe/trunk/test/ARCMT/dealloc.m.result
    cfe/trunk/test/ARCMT/init.m
    cfe/trunk/test/ARCMT/init.m.result
    cfe/trunk/test/ARCMT/nonobjc-to-objc-cast.m
    cfe/trunk/test/ARCMT/nonobjc-to-objc-cast.m.result
    cfe/trunk/test/ARCMT/releases.m
    cfe/trunk/test/ARCMT/releases.m.result
    cfe/trunk/test/ARCMT/remove-dealloc-method.m
    cfe/trunk/test/ARCMT/remove-dealloc-method.m.result
    cfe/trunk/test/ARCMT/remove-dealloc-zerouts.m
    cfe/trunk/test/ARCMT/remove-dealloc-zerouts.m.result
    cfe/trunk/test/ARCMT/remove-statements.m
    cfe/trunk/test/ARCMT/remove-statements.m.result
    cfe/trunk/test/ARCMT/retains.m
    cfe/trunk/test/ARCMT/retains.m.result
    cfe/trunk/test/ARCMT/rewrite-block-var.m
    cfe/trunk/test/ARCMT/rewrite-block-var.m.result
    cfe/trunk/test/ARCMT/safe-arc-assign.m
    cfe/trunk/test/ARCMT/safe-arc-assign.m.result
    cfe/trunk/tools/arcmt-test/arcmt-test.cpp

Modified: cfe/trunk/test/ARCMT/alloc-with-zone.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/alloc-with-zone.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/alloc-with-zone.m (original)
+++ cfe/trunk/test/ARCMT/alloc-with-zone.m Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/alloc-with-zone.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/alloc-with-zone.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/alloc-with-zone.m.result (original)
+++ cfe/trunk/test/ARCMT/alloc-with-zone.m.result Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/assign-prop-no-arc-runtime.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/assign-prop-no-arc-runtime.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/assign-prop-no-arc-runtime.m (original)
+++ cfe/trunk/test/ARCMT/assign-prop-no-arc-runtime.m Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/assign-prop-no-arc-runtime.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/assign-prop-no-arc-runtime.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/assign-prop-no-arc-runtime.m.result (original)
+++ cfe/trunk/test/ARCMT/assign-prop-no-arc-runtime.m.result Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m (original)
+++ cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m.result (original)
+++ cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m.result Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/atautorelease-2.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/atautorelease-2.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/atautorelease-2.m (original)
+++ cfe/trunk/test/ARCMT/atautorelease-2.m Wed Jun 15 19:53:46 2011
@@ -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

Modified: cfe/trunk/test/ARCMT/atautorelease-2.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/atautorelease-2.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/atautorelease-2.m.result (original)
+++ cfe/trunk/test/ARCMT/atautorelease-2.m.result Wed Jun 15 19:53:46 2011
@@ -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

Modified: cfe/trunk/test/ARCMT/atautorelease-3.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/atautorelease-3.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/atautorelease-3.m (original)
+++ cfe/trunk/test/ARCMT/atautorelease-3.m Wed Jun 15 19:53:46 2011
@@ -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

Modified: cfe/trunk/test/ARCMT/atautorelease-3.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/atautorelease-3.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/atautorelease-3.m.result (original)
+++ cfe/trunk/test/ARCMT/atautorelease-3.m.result Wed Jun 15 19:53:46 2011
@@ -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

Modified: cfe/trunk/test/ARCMT/atautorelease.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/atautorelease.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/atautorelease.m (original)
+++ cfe/trunk/test/ARCMT/atautorelease.m Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/atautorelease.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/atautorelease.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/atautorelease.m.result (original)
+++ cfe/trunk/test/ARCMT/atautorelease.m.result Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/autoreleases.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/autoreleases.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/autoreleases.m (original)
+++ cfe/trunk/test/ARCMT/autoreleases.m Wed Jun 15 19:53:46 2011
@@ -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;

Modified: cfe/trunk/test/ARCMT/autoreleases.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/autoreleases.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/autoreleases.m.result (original)
+++ cfe/trunk/test/ARCMT/autoreleases.m.result Wed Jun 15 19:53:46 2011
@@ -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;

Modified: cfe/trunk/test/ARCMT/cxx-checking.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/cxx-checking.mm?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/cxx-checking.mm (original)
+++ cfe/trunk/test/ARCMT/cxx-checking.mm Wed Jun 15 19:53:46 2011
@@ -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}}

Modified: cfe/trunk/test/ARCMT/dealloc.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/dealloc.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/dealloc.m (original)
+++ cfe/trunk/test/ARCMT/dealloc.m Wed Jun 15 19:53:46 2011
@@ -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

Modified: cfe/trunk/test/ARCMT/dealloc.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/dealloc.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/dealloc.m.result (original)
+++ cfe/trunk/test/ARCMT/dealloc.m.result Wed Jun 15 19:53:46 2011
@@ -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

Modified: cfe/trunk/test/ARCMT/init.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/init.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/init.m (original)
+++ cfe/trunk/test/ARCMT/init.m Wed Jun 15 19:53:46 2011
@@ -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

Modified: cfe/trunk/test/ARCMT/init.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/init.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/init.m.result (original)
+++ cfe/trunk/test/ARCMT/init.m.result Wed Jun 15 19:53:46 2011
@@ -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

Modified: cfe/trunk/test/ARCMT/nonobjc-to-objc-cast.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/nonobjc-to-objc-cast.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/nonobjc-to-objc-cast.m (original)
+++ cfe/trunk/test/ARCMT/nonobjc-to-objc-cast.m Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/nonobjc-to-objc-cast.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/nonobjc-to-objc-cast.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/nonobjc-to-objc-cast.m.result (original)
+++ cfe/trunk/test/ARCMT/nonobjc-to-objc-cast.m.result Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/releases.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/releases.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/releases.m (original)
+++ cfe/trunk/test/ARCMT/releases.m Wed Jun 15 19:53:46 2011
@@ -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;

Modified: cfe/trunk/test/ARCMT/releases.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/releases.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/releases.m.result (original)
+++ cfe/trunk/test/ARCMT/releases.m.result Wed Jun 15 19:53:46 2011
@@ -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;

Modified: cfe/trunk/test/ARCMT/remove-dealloc-method.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/remove-dealloc-method.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/remove-dealloc-method.m (original)
+++ cfe/trunk/test/ARCMT/remove-dealloc-method.m Wed Jun 15 19:53:46 2011
@@ -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)

Modified: cfe/trunk/test/ARCMT/remove-dealloc-method.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/remove-dealloc-method.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/remove-dealloc-method.m.result (original)
+++ cfe/trunk/test/ARCMT/remove-dealloc-method.m.result Wed Jun 15 19:53:46 2011
@@ -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)

Modified: cfe/trunk/test/ARCMT/remove-dealloc-zerouts.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/remove-dealloc-zerouts.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/remove-dealloc-zerouts.m (original)
+++ cfe/trunk/test/ARCMT/remove-dealloc-zerouts.m Wed Jun 15 19:53:46 2011
@@ -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 

Modified: cfe/trunk/test/ARCMT/remove-dealloc-zerouts.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/remove-dealloc-zerouts.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/remove-dealloc-zerouts.m.result (original)
+++ cfe/trunk/test/ARCMT/remove-dealloc-zerouts.m.result Wed Jun 15 19:53:46 2011
@@ -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 

Modified: cfe/trunk/test/ARCMT/remove-statements.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/remove-statements.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/remove-statements.m (original)
+++ cfe/trunk/test/ARCMT/remove-statements.m Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/remove-statements.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/remove-statements.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/remove-statements.m.result (original)
+++ cfe/trunk/test/ARCMT/remove-statements.m.result Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/retains.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/retains.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/retains.m (original)
+++ cfe/trunk/test/ARCMT/retains.m Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/retains.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/retains.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/retains.m.result (original)
+++ cfe/trunk/test/ARCMT/retains.m.result Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/rewrite-block-var.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/rewrite-block-var.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/rewrite-block-var.m (original)
+++ cfe/trunk/test/ARCMT/rewrite-block-var.m Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/rewrite-block-var.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/rewrite-block-var.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/rewrite-block-var.m.result (original)
+++ cfe/trunk/test/ARCMT/rewrite-block-var.m.result Wed Jun 15 19:53:46 2011
@@ -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"

Modified: cfe/trunk/test/ARCMT/safe-arc-assign.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/safe-arc-assign.m?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/safe-arc-assign.m (original)
+++ cfe/trunk/test/ARCMT/safe-arc-assign.m Wed Jun 15 19:53:46 2011
@@ -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) {

Modified: cfe/trunk/test/ARCMT/safe-arc-assign.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/safe-arc-assign.m.result?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/safe-arc-assign.m.result (original)
+++ cfe/trunk/test/ARCMT/safe-arc-assign.m.result Wed Jun 15 19:53:46 2011
@@ -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) {

Modified: cfe/trunk/tools/arcmt-test/arcmt-test.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/arcmt-test/arcmt-test.cpp?rev=133119&r1=133118&r2=133119&view=diff
==============================================================================
--- cfe/trunk/tools/arcmt-test/arcmt-test.cpp (original)
+++ cfe/trunk/tools/arcmt-test/arcmt-test.cpp Wed Jun 15 19:53:46 2011
@@ -100,22 +100,20 @@
     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 @@
   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());





More information about the cfe-commits mailing list