diff options
| author | Dominique d'Humieres <dominiq@lps.ens.fr> | 2011-12-04 08:34:25 +0100 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 2011-12-04 07:34:25 +0000 |
| commit | 275263934c50a94f0dc14fbdc803bd211c2abc1a (patch) | |
| tree | d99ce5415bada63f93041a80715a221b851853a5 | |
| parent | 8f3c0aa26a87ba8056f3eb73a11fc313030c328a (diff) | |
| download | gcc-275263934c50a94f0dc14fbdc803bd211c2abc1a.zip gcc-275263934c50a94f0dc14fbdc803bd211c2abc1a.tar.gz gcc-275263934c50a94f0dc14fbdc803bd211c2abc1a.tar.bz2 | |
re PR testsuite/51349 (FAIL: obj-c++.dg/naming-[34].mm)
2011-12-03 Dominique d'Humieres <dominiq@lps.ens.fr>
PR obj-c++/51349
* obj-c++.dg/naming-3.mm: Adjust for changing error messages.
* obj-c++.dg/naming-4.mm: Likewise.
From-SVN: r181984
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/naming-3.mm | 4 | ||||
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/naming-4.mm | 12 |
3 files changed, 14 insertions, 8 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 450a163..c89974f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-12-03 Dominique d'Humieres <dominiq@lps.ens.fr> + + PR obj-c++/51349 + * obj-c++.dg/naming-3.mm: Adjust for changing error messages. + * obj-c++.dg/naming-4.mm: Likewise. + 2011-12-03 Jack Howarth <howarth@bromo.med.uc.edu> * gcc.dg/darwin-segaddr.c: Use -no-pie. diff --git a/gcc/testsuite/obj-c++.dg/naming-3.mm b/gcc/testsuite/obj-c++.dg/naming-3.mm index ac81267..dda15fc 100644 --- a/gcc/testsuite/obj-c++.dg/naming-3.mm +++ b/gcc/testsuite/obj-c++.dg/naming-3.mm @@ -3,9 +3,9 @@ @interface A { - char x; /* { dg-error "conflicts" } */ + char x; /* { dg-message "previous declaration" } */ char x; -} /* { dg-error "declaration" } */ +} /* { dg-error "redeclaration" } */ @end @interface B : A diff --git a/gcc/testsuite/obj-c++.dg/naming-4.mm b/gcc/testsuite/obj-c++.dg/naming-4.mm index 4bb7312..22d0b78 100644 --- a/gcc/testsuite/obj-c++.dg/naming-4.mm +++ b/gcc/testsuite/obj-c++.dg/naming-4.mm @@ -28,12 +28,12 @@ char r0; char r1; char r2; char r3; char r4; char r5; char r6; char r7; char r8; char r9; char s0; char s1; char s2; char s3; char s4; char s5; char s6; char s7; char s8; char s9; - char x; /* { dg-error "conflicts" } */ + char x; /* { dg-message "previous declaration" } */ char x; char z; /* { dg-message "previous declaration" } */ char k; /* { dg-message "previous declaration" } */ -} /* { dg-error "declaration" } */ +} /* { dg-error "redeclaration" } */ @end @interface B : A @@ -60,11 +60,11 @@ char Br0; char Br1; char Br2; char Br3; char Br4; char Br5; char Br6; char Br7; char Br8; char Br9; char Bs0; char Bs1; char Bs2; char Bs3; char Bs4; char Bs5; char Bs6; char Bs7; char Bs8; char Bs9; - char y; /* { dg-message "conflicts" } */ + char y; /* { dg-message "previous declaration" } */ char y; char z; /* { dg-error "duplicate instance variable" } */ -} /* { dg-error "declaration" } */ +} /* { dg-error "redeclaration" } */ @end @interface C : A @@ -97,12 +97,12 @@ char Dr0; char Dr1; char Dr2; char Dr3; char Dr4; char Dr5; char Dr6; char Dr7; char Dr8; char Dr9; char Ds0; char Ds1; char Ds2; char Ds3; char Ds4; char Ds5; char Ds6; char Ds7; char Ds8; char Ds9; - char y; /* { dg-message "conflicts" } */ + char y; /* { dg-message "previous declaration" } */ char y; char w; /* { dg-error "duplicate instance variable" } */ char k; /* { dg-error "duplicate instance variable" } */ -} /* { dg-error "declaration" } */ +} /* { dg-error "redeclaration" } */ @end /* Finally, make sure that anonymous instance variables don't trigger |