gcc/testsuite:

	* objc.dg/foreach-1.m: Skip for Darwin < 9.
	* objc.dg/objc-foreach-4.m: Likewise.
	* objc.dg/objc-foreach-5.m: Skip for Darwin < 9, adjust headers.
	* objc.dg/foreach-2.m: Skip for Darwin < 9, return self from init.
	* objc.dg/foreach-4.m: Likewise.
	* objc.dg/foreach-5.m: Likewise.
	* objc.dg/foreach-3.m: Return self from init.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168616 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 82d316a..f2d6fcd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-09  Iain Sandoe  <iains@gcc.gnu.org>
+
+       * objc.dg/foreach-1.m: Skip for Darwin < 9.
+       * objc.dg/objc-foreach-4.m: Likewise.
+       * objc.dg/objc-foreach-5.m: Skip for Darwin < 9, adjust headers.
+       * objc.dg/foreach-2.m: Skip for Darwin < 9, return self from init.
+       * objc.dg/foreach-4.m: Likewise.
+       * objc.dg/foreach-5.m: Likewise.
+       * objc.dg/foreach-3.m: Return self from init.
+
 2011-01-09  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        PR fortran/38536

diff --git a/gcc/testsuite/objc.dg/foreach-1.m b/gcc/testsuite/objc.dg/foreach-1.m
index 60993d5..bc9a21a 100644 (file)
--- a/gcc/testsuite/objc.dg/foreach-1.m
+++ b/gcc/testsuite/objc.dg/foreach-1.m
@@ -2,6 +2,7 @@
    do nothing.
 */
 /* { dg-do run } */
+/* { dg-skip-if "No NeXT fast enum. pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
 /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
 /* { dg-additional-sources "../objc-obj-c++-shared/Object1.m" } */
 /* { dg-options "-Wall" } */

diff --git a/gcc/testsuite/objc.dg/foreach-2.m b/gcc/testsuite/objc.dg/foreach-2.m
index e442223..80e9e70 100644 (file)
--- a/gcc/testsuite/objc.dg/foreach-2.m
+++ b/gcc/testsuite/objc.dg/foreach-2.m
@@ -2,6 +2,7 @@
    the basic syntax 'for (object in array) statements'
 */
 /* { dg-do run } */
+/* { dg-skip-if "No NeXT fast enum. pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
 /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
 /* { dg-options "-mno-constant-cfstrings" { target *-*-darwin* } } */
 /* { dg-additional-sources "../objc-obj-c++-shared/Object1.m" } */
@@ -49,6 +50,7 @@ struct __objcFastEnumerationState
   length = l;
   objects = o;
   mutated = 0;
+  return self;
 }
 - (void) mutate
 {

diff --git a/gcc/testsuite/objc.dg/foreach-3.m b/gcc/testsuite/objc.dg/foreach-3.m
index da23f83..ac08a40 100644 (file)
--- a/gcc/testsuite/objc.dg/foreach-3.m
+++ b/gcc/testsuite/objc.dg/foreach-3.m
@@ -50,6 +50,7 @@ struct __objcFastEnumerationState
   length = l;
   objects = o;
   mutated = 0;
+  return self;
 }
 - (void) mutate
 {

diff --git a/gcc/testsuite/objc.dg/foreach-4.m b/gcc/testsuite/objc.dg/foreach-4.m
index 55484d7..ed5dda0 100644 (file)
--- a/gcc/testsuite/objc.dg/foreach-4.m
+++ b/gcc/testsuite/objc.dg/foreach-4.m
@@ -2,6 +2,7 @@
    the declaration syntax 'for (id object in array) statements'
 */
 /* { dg-do run } */
+/* { dg-skip-if "No NeXT fast enum. pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
 /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
 /* { dg-options "-mno-constant-cfstrings" { target *-*-darwin* } } */
 /* { dg-additional-sources "../objc-obj-c++-shared/Object1.m" } */
@@ -49,6 +50,7 @@ struct __objcFastEnumerationState
   length = l;
   objects = o;
   mutated = 0;
+  return self;
 }
 - (void) mutate
 {

diff --git a/gcc/testsuite/objc.dg/foreach-5.m b/gcc/testsuite/objc.dg/foreach-5.m
index ae06d67..7bcabee 100644 (file)
--- a/gcc/testsuite/objc.dg/foreach-5.m
+++ b/gcc/testsuite/objc.dg/foreach-5.m
@@ -2,6 +2,7 @@
    define your own NSFastEnumeration struct, the compiler picks it up.
 */
 /* { dg-do run } */
+/* { dg-skip-if "No NeXT fast enum. pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
 /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
 /* { dg-options "-mno-constant-cfstrings" { target *-*-darwin* } } */
 /* { dg-additional-sources "../objc-obj-c++-shared/Object1.m" } */
@@ -47,6 +48,7 @@ typedef struct
   length = l;
   objects = o;
   mutated = 0;
+  return self;
 }
 - (void) mutate
 {

diff --git a/gcc/testsuite/objc.dg/objc-foreach-4.m b/gcc/testsuite/objc.dg/objc-foreach-4.m
index 69c8c73..292a908 100644 (file)
--- a/gcc/testsuite/objc.dg/objc-foreach-4.m
+++ b/gcc/testsuite/objc.dg/objc-foreach-4.m
@@ -2,6 +2,7 @@
 /* FIXME: Run this test with the GNU runtime as well.  */
 /* { dg-do compile { target *-*-darwin* } } */
 /* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-skip-if "No NeXT fast enum. pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
 
 #include <objc/objc-api.h>
 #include <Foundation/Foundation.h>

diff --git a/gcc/testsuite/objc.dg/objc-foreach-5.m b/gcc/testsuite/objc.dg/objc-foreach-5.m
index 26c2dfc..cb15781 100644 (file)
--- a/gcc/testsuite/objc.dg/objc-foreach-5.m
+++ b/gcc/testsuite/objc.dg/objc-foreach-5.m
@@ -1,8 +1,8 @@
 /* FIXME: Run this test with the GNU runtime as well.  */
 /* { dg-do compile { target *-*-darwin* } } */
 /* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-skip-if "No NeXT fast enum. pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
 
-#include <objc/objc-api.h>
 #import <Foundation/Foundation.h>
 
 NSArray * createTestVictim(unsigned capacity) {