In gcc/testsuite/: 2010-11-29 Nicola Pero <nicola.pero@meta-innovation.com>

In gcc/testsuite/:
2010-11-29  Nicola Pero  <nicola.pero@meta-innovation.com>

	* obj-c++.dg/property/at-property-1.mm: Fixed testcase.
	* obj-c++.dg/property/at-property-16.mm: Fixed testcase.
	* obj-c++.dg/property/at-property-20.mm: Fixed testcase.

From-SVN: r167232

4 files changed, 20 insertions, 18 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4a6ad47..c7830eb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-29  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* obj-c++.dg/property/at-property-1.mm: Fixed testcase.
+	* obj-c++.dg/property/at-property-16.mm: Fixed testcase.
+	* obj-c++.dg/property/at-property-20.mm: Fixed testcase.
+
 2010-11-28  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/46662
diff --git a/gcc/testsuite/obj-c++.dg/property/at-property-1.mm b/gcc/testsuite/obj-c++.dg/property/at-property-1.mm
index c3be5d8..1b945bd 100644
--- a/gcc/testsuite/obj-c++.dg/property/at-property-1.mm
+++ b/gcc/testsuite/obj-c++.dg/property/at-property-1.mm
@@ -15,9 +15,6 @@
 @property (readonly,) int f;    /* { dg-error "expected identifier" } */
 @property (xxx) int g;          /* { dg-error "unknown property attribute" } */
 @property (readonly,xxx) int h; /* { dg-error "unknown property attribute" } */
-/* FIXME - there is a problem with the testuite in running the following test.  The compiler
-   generates the messages, but the testsuite still complains.  */
-/*@property ( int i;*/          /* dg-error "unknown property attribute" */
-                                /* dg-error "expected ... "       "" { target *-*-* } 18 */
-                                /* dg-error "expected identfier " "" { target *-*-* } 18 */
+@property ( int i;              /* { dg-error "expected identifier" } */
+                                /* { dg-error "expected ... "       "" { target *-*-* } 18 } */
 @end
diff --git a/gcc/testsuite/obj-c++.dg/property/at-property-16.mm b/gcc/testsuite/obj-c++.dg/property/at-property-16.mm
index 8cab00a..2639de9 100644
--- a/gcc/testsuite/obj-c++.dg/property/at-property-16.mm
+++ b/gcc/testsuite/obj-c++.dg/property/at-property-16.mm
@@ -14,10 +14,10 @@
 @property (retain) id b;                  /* { dg-warning "originally specified here" } */
 @property int c;                          /* { dg-warning "originally specified here" } */
 @property (nonatomic) int d;              /* { dg-warning "originally specified here" } */
-/* FIXME: The compiler generates these errors, but the testsuite still fails the tests.  */
-@property int e;                          /* dg-warning "originally specified here" */
-@property int f;                          /* dg-warning "originally specified here" */
-@property int g;                          /* dg-warning "originally specified here" */
+/* FIXME: Mysteriously the next 3 need to be 'dg-message' instead of 'dg-warning' for the testcase to work.  */
+@property int e;                          /* { dg-message "originally specified here" } */
+@property int f;                          /* { dg-message "originally specified here" } */
+@property int g;                          /* { dg-message "originally specified here" } */
 @property (readonly) int h;               /* Ok */
 @property (readonly,getter=getMe) int i;  /* { dg-warning "originally specified here" } */
 @end
@@ -39,10 +39,9 @@
 @property (assign) id b;         /* { dg-warning "assign semantics attributes of property .b. conflict with previous declaration" } */
 @property (nonatomic) int c;     /* { dg-warning ".nonatomic. attribute of property .c. conflicts with previous declaration" } */
 @property int d;                 /* { dg-warning ".nonatomic. attribute of property .d. conflicts with previous declaration" } */
-/* FIXME: The compiler generates these errors, but the testsuite still fails the tests.  */
-/*@property (setter=setX:) int e;*/  /*  dg-warning ".setter. attribute of property .e. conflicts with previous declaration"  */
-/*@property (getter=x) int f;*/      /*  dg-warning ".getter. attribute of property .f. conflicts with previous declaration"  */
-/*@property (readonly) int g;*/      /*  dg-warning ".readonly. attribute of property .g. conflicts with previous declaration"  */
+@property (setter=setX:) int e;  /* { dg-warning ".setter. attribute of property .e. conflicts with previous declaration" } */
+@property (getter=x) int f;      /* { dg-warning ".getter. attribute of property .f. conflicts with previous declaration" } */
+@property (readonly) int g;      /* { dg-warning ".readonly. attribute of property .g. conflicts with previous declaration" } */
 @property (readwrite) int h;     /* Ok */
 @property (readonly) int i;      /* { dg-warning ".getter. attribute of property .i. conflicts with previous declaration" } */
 @end
diff --git a/gcc/testsuite/obj-c++.dg/property/at-property-20.mm b/gcc/testsuite/obj-c++.dg/property/at-property-20.mm
index 0fae36b..077fe6d 100644
--- a/gcc/testsuite/obj-c++.dg/property/at-property-20.mm
+++ b/gcc/testsuite/obj-c++.dg/property/at-property-20.mm
@@ -42,10 +42,10 @@
 @property float c;                            /* { dg-warning "originally specified here" } */
 @property (assign) MyRootClass *d;            /* { dg-warning "originally specified here" } */
 @property (assign) MySubClass1 *e;            /* { dg-warning "originally specified here" } */
-/* FIXME: The compiler seems to generate messages correctly, but the testsuite still fails the test.  */
-/*@property (assign, readonly) MySubClass1 *f; */ /*  dg-warning "originally specified here"  */
+/* FIXME: Mysteriously two of the next three need to be 'dg-message' instead of 'dg-warning' for the testcase to work.  */
+@property (assign, readonly) MySubClass1 *f;  /* { dg-message "originally specified here" } */
 @property (assign) MySubClass3 *g;            /* { dg-warning "originally specified here" } */
-/*@property (assign, readonly) MySubClass3 *h; */ /*  dg-warning "originally specified here"  */
+@property (assign, readonly) MySubClass3 *h;  /* { dg-message "originally specified here"  } */
 @end
 
 /* The following are all OK because they are identical.  */
@@ -69,9 +69,9 @@
 @property int c;                              /* { dg-warning "type of property .c. conflicts with previous declaration" } */
 @property (assign) id d;                      /* { dg-warning "type of property .d. conflicts with previous declaration" } */
 @property (assign) MyRootClass *e;            /* { dg-warning "type of property .e. conflicts with previous declaration" } */
-/*@property (assign, readonly) MyRootClass *f; */ /*  dg-warning "type of property .f. conflicts with previous declaration"  */
+@property (assign, readonly) MyRootClass *f;  /* { dg-warning "type of property .f. conflicts with previous declaration" } */
 @property (assign) MySubClass2 *g;            /* { dg-warning "type of property .g. conflicts with previous declaration" } */
-/*@property (assign, readonly) MySubClass2 *h; */ /*  dg-warning "type of property .h. conflicts with previous declaration"  */
+@property (assign, readonly) MySubClass2 *h;  /* { dg-warning "type of property .h. conflicts with previous declaration" } */
 @end
 
 /* The following are OK.  */