diff options
| author | Nicola Pero <nicola.pero@meta-innovation.com> | 2011-01-12 09:46:56 +0000 |
|---|---|---|
| committer | Nicola Pero <nicola@gcc.gnu.org> | 2011-01-12 09:46:56 +0000 |
| commit | 81dc6eea5e96c6ec48f6a1d1e8855db0d8805bdd (patch) | |
| tree | 367a2a8ca87ab481e0715ede779bb30fb6c644ca /gcc/testsuite/obj-c++.dg/method-15.mm | |
| parent | d853ee42d2bd96a3d589e349c57a2e71e4ace38f (diff) | |
| download | gcc-81dc6eea5e96c6ec48f6a1d1e8855db0d8805bdd.zip gcc-81dc6eea5e96c6ec48f6a1d1e8855db0d8805bdd.tar.gz gcc-81dc6eea5e96c6ec48f6a1d1e8855db0d8805bdd.tar.bz2 | |
In gcc/testsuite/: 2011-01-12 Nicola Pero <nicola.pero@meta-innovation.com>
In gcc/testsuite/:
2011-01-12 Nicola Pero <nicola.pero@meta-innovation.com>
Fixed the Objective-C++ testsuite and updated all tests.
* lib/obj-c++.exp (obj-c++_init): Declare and set
gcc_warning_prefix and gcc_error_prefix.
* obj-c++.dg/attributes/categ-attribute-2.mm: Fixed usage of
'dg-warning', 'dg-message' and 'dg-error'.
* obj-c++.dg/class-extension-3.mm: Likewise.
* obj-c++.dg/class-protocol-1.mm: Likewise.
* obj-c++.dg/cxx-scope-2.mm: Likewise.
* obj-c++.dg/encode-7.mm: Likewise.
* obj-c++.dg/exceptions-3.mm: Likewise.
* obj-c++.dg/exceptions-5.mm: Likewise.
* obj-c++.dg/method-12.mm: Likewise.
* obj-c++.dg/method-13.mm: Likewise.
* obj-c++.dg/method-15.mm: Likewise.
* obj-c++.dg/method-16.mm: Likewise.
* obj-c++.dg/method-4.mm: Likewise.
* obj-c++.dg/method-8.mm: Likewise.
* obj-c++.dg/method-conflict-1.mm: Likewise.
* obj-c++.dg/method-conflict-2.mm: Likewise.
* obj-c++.dg/method-conflict-3.mm: Likewise. Also, removed FIXME
and uncommented second part of the testcase now that the testsuite
works correctly.
* obj-c++.dg/method-conflict-4.mm: Likewise. Also, removed FIXME
and uncommented second part of the testcase now that the testsuite
works correctly.
* obj-c++.dg/private-1.mm: Likewise.
* obj-c++.dg/proto-lossage-4.mm: Likewise.
* obj-c++.dg/syntax-error-7.mm: Likewise.
* obj-c++.dg/warn5.mm: Likewise.
* obj-c++.dg/property/at-property-14.mm: Likewise.
* obj-c++.dg/property/at-property-16.mm: Likewise, and removed
FIXME.
* obj-c++.dg/property/at-property-18.mm: Likewise.
* obj-c++.dg/property/at-property-20.mm: Likewise, and removed
FIXME.
* obj-c++.dg/property/at-property-21.mm: Likewise.
* obj-c++.dg/property/at-property-28.mm: Likewise.
* obj-c++.dg/property/at-property-5.mm: Likewise.
* obj-c++.dg/property/dynamic-2.mm: Likewise.
* obj-c++.dg/property/property-neg-3.mm: Likewise.
* obj-c++.dg/property/synthesize-11.mm: Likewise.
* obj-c++.dg/property/synthesize-6.mm: Likewise.
* obj-c++.dg/property/synthesize-8.mm: Likewise.
* obj-c++.dg/property/synthesize-9.mm: Likewise.
* obj-c++.dg/tls/diag-5.mm: Likewise.
* obj-c++.dg/ivar-invalid-type-1.mm: Removed FIXME and uncommented
dg-error, now matched correctly.
From-SVN: r168699
Diffstat (limited to 'gcc/testsuite/obj-c++.dg/method-15.mm')
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/method-15.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/testsuite/obj-c++.dg/method-15.mm b/gcc/testsuite/obj-c++.dg/method-15.mm index 055e8ca..860aad6 100644 --- a/gcc/testsuite/obj-c++.dg/method-15.mm +++ b/gcc/testsuite/obj-c++.dg/method-15.mm @@ -32,9 +32,9 @@ { NTGridDataObject *result = [[NTGridDataObject alloc] initWithData:data]; /* { dg-warning "multiple methods named .\\-initWithData:. found" "" { target *-*-* } 33 } */ - /* { dg-warning "using .\\-\\(id\\)initWithData:\\(Object \\*\\)data." "" { target *-*-* } 9 } */ - /* { dg-warning "also found .\\-\\(id\\)initWithData:\\(id <MyObject, MyCoding>\\)data." "" { target *-*-* } 17 } */ - /* { dg-warning "also found .\\-\\(id\\)initWithData:\\(int\\)data." "" { target *-*-* } 13 } */ + /* { dg-message "using .\\-\\(id\\)initWithData:\\(Object \\*\\)data." "" { target *-*-* } 9 } */ + /* { dg-message "also found .\\-\\(id\\)initWithData:\\(id <MyObject, MyCoding>\\)data." "" { target *-*-* } 17 } */ + /* { dg-message "also found .\\-\\(id\\)initWithData:\\(int\\)data." "" { target *-*-* } 13 } */ /* The following warning is a consequence of picking the "wrong" method signature. */ /* { dg-warning "passing argument 1 of .initWithData:. from distinct Objective\\-C type" "" { target *-*-* } 33 } */ |