don't try to run Objective-C API=2 tests for Darwin < 9

testsuite:
	* objc.dg/special/load-category-1.m: Remove unused header.
	* objc.dg/special/load-category-1a.m: Likewise.
	* objc.dg/special/load-category-2.m: Likewise.
	* objc.dg/special/load-category-2a.m: Likewise.
	* objc.dg/special/load-category-3.m: Likewise.
	* objc.dg/special/load-category-3a.m: Likewise.
	* objc.dg/attributes/proto-attribute-2.m: Likewise.
	* objc.dg/attributes/proto-attribute-3.m: Likewise.
	* objc.dg/attributes/class-attribute-1.m: Likewise.
	* objc.dg/property/property.exp: Don't run for Darwin < 9.
	* obj-c++.dg/property/property.exp: Likewise.
	* objc.dg/attributes/method-sentinel-1.m: Update type header.
	* obj-c++.dg/attributes/method-sentinel-1.mm: Likewise.
	* obj-c++.dg/attributes/proto-attribute-2.mm: Skip for Darwin < 9.
	* obj-c++.dg/attributes/class-attribute-1.mm: Likewise.
	* obj-c++.dg/attributes/proto-attribute-3.mm: Likewise.
	* obj-c++.dg/template-8.mm: Likewise.

From-SVN: r170001

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6a38531..c39034c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,23 @@
+2011-02-10  Iain Sandoe  <iains@gcc.gnu.org>
+
+       * objc.dg/special/load-category-1.m: Remove unused header.
+       * objc.dg/special/load-category-1a.m: Likewise.
+       * objc.dg/special/load-category-2.m: Likewise.
+       * objc.dg/special/load-category-2a.m: Likewise.
+       * objc.dg/special/load-category-3.m: Likewise.
+       * objc.dg/special/load-category-3a.m: Likewise.
+       * objc.dg/attributes/proto-attribute-2.m: Likewise.
+       * objc.dg/attributes/proto-attribute-3.m: Likewise.
+       * objc.dg/attributes/class-attribute-1.m: Likewise.
+       * objc.dg/property/property.exp: Don't run for Darwin < 9.
+       * obj-c++.dg/property/property.exp: Likewise.
+       * objc.dg/attributes/method-sentinel-1.m: Update type header.
+       * obj-c++.dg/attributes/method-sentinel-1.mm: Likewise.
+       * obj-c++.dg/attributes/proto-attribute-2.mm: Skip for Darwin < 9.
+       * obj-c++.dg/attributes/class-attribute-1.mm: Likewise.
+       * obj-c++.dg/attributes/proto-attribute-3.mm: Likewise.
+       * obj-c++.dg/template-8.mm: Likewise.
+
 2011-02-10  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/47665

diff --git a/gcc/testsuite/obj-c++.dg/attributes/class-attribute-1.mm b/gcc/testsuite/obj-c++.dg/attributes/class-attribute-1.mm
index 8c9181a..f078339 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/attributes/class-attribute-1.mm
+++ b/gcc/testsuite/obj-c++.dg/attributes/class-attribute-1.mm
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-skip-if "No API#2 pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
 
 /* Test deprecate attribute with an @interface declaration.  */
 

diff --git a/gcc/testsuite/obj-c++.dg/attributes/method-sentinel-1.mm b/gcc/testsuite/obj-c++.dg/attributes/method-sentinel-1.mm
index ecaa36c..2b8e6fd 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/attributes/method-sentinel-1.mm
+++ b/gcc/testsuite/obj-c++.dg/attributes/method-sentinel-1.mm
@@ -4,6 +4,8 @@
 
 #include <objc/objc.h>
 #include <stdlib.h>
+/* Ensure a compatible definition of nil.  */
+#include "../../objc-obj-c++-shared/objc-test-suite-types.h"
 
 @interface NSArray
 {

diff --git a/gcc/testsuite/obj-c++.dg/attributes/proto-attribute-2.mm b/gcc/testsuite/obj-c++.dg/attributes/proto-attribute-2.mm
index 1e81c0b..aba58ff 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/attributes/proto-attribute-2.mm
+++ b/gcc/testsuite/obj-c++.dg/attributes/proto-attribute-2.mm
@@ -1,5 +1,6 @@
 /* Contributed by Nicola Pero <nicola.pero@meta-innovation.com>, November 2010.  */
 /* { dg-do compile } */
+/* { dg-skip-if "No API#2 pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
 
 /* Test deprecate attribute with a forward declarations of
    @protocol.  */

diff --git a/gcc/testsuite/obj-c++.dg/attributes/proto-attribute-3.mm b/gcc/testsuite/obj-c++.dg/attributes/proto-attribute-3.mm
index f509bb7..fc5251e 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/attributes/proto-attribute-3.mm
+++ b/gcc/testsuite/obj-c++.dg/attributes/proto-attribute-3.mm
@@ -1,5 +1,7 @@
 /* Contributed by Nicola Pero <nicola.pero@meta-innovation.com>, November 2010.  */
 /* { dg-do compile } */
+/* { dg-skip-if "No API#2 pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
+
 
 /* Test deprecate attribute with normal @protocol declarations.  */
 

diff --git a/gcc/testsuite/obj-c++.dg/property/property.exp b/gcc/testsuite/obj-c++.dg/property/property.exp
index fb809b4..468e34b 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/property/property.exp
+++ b/gcc/testsuite/obj-c++.dg/property/property.exp
@@ -33,9 +33,10 @@ set tests [lsort [glob -nocomplain $srcdir/$subdir/*.mm]]
 # Main loop.
 dg-runtest $tests "-fgnu-runtime" $DEFAULT_OBJCXXFLAGS
 
-# darwin targets can also run code with the NeXT runtime.
-if [istarget "*-*-darwin*" ] {
-dg-runtest $tests "-fnext-runtime" $DEFAULT_OBJCXXFLAGS
+# Darwin targets can also run code with the NeXT runtime.
+# but Properties are not supported by the runtime lib before Darwin 9.
+if [istarget "*-*-darwin\[9123\]*" ] {
+  dg-runtest $tests "-fnext-runtime" $DEFAULT_OBJCXXFLAGS
 }
 
 # All done.

diff --git a/gcc/testsuite/obj-c++.dg/template-8.mm b/gcc/testsuite/obj-c++.dg/template-8.mm
index 97bdb7f..df215b8 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/template-8.mm
+++ b/gcc/testsuite/obj-c++.dg/template-8.mm
@@ -3,6 +3,7 @@
 /* Author: Fariborz Jahanian <fjahanian@apple.com> */
 /* Adapted by Nicola Pero <nicola.pero@meta-innovation.com> */
 /* { dg-do run } */
+/* { dg-skip-if "No API#2 pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
 /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
 
 #include <objc/objc.h>

diff --git a/gcc/testsuite/objc.dg/attributes/class-attribute-1.m b/gcc/testsuite/objc.dg/attributes/class-attribute-1.m
index 2529323..3444760 100644 (file)
--- a/gcc/testsuite/objc.dg/attributes/class-attribute-1.m
+++ b/gcc/testsuite/objc.dg/attributes/class-attribute-1.m
@@ -3,7 +3,6 @@
 /* Test deprecate attribute with an @interface declaration.  */
 
 #include <objc/objc.h>
-#include <objc/runtime.h>
 
 __attribute__ ((deprecated)) 
 @interface DeprecatedClass

diff --git a/gcc/testsuite/objc.dg/attributes/method-sentinel-1.m b/gcc/testsuite/objc.dg/attributes/method-sentinel-1.m
index ecaa36c..e2abb1e 100644 (file)
--- a/gcc/testsuite/objc.dg/attributes/method-sentinel-1.m
+++ b/gcc/testsuite/objc.dg/attributes/method-sentinel-1.m
@@ -4,6 +4,7 @@
 
 #include <objc/objc.h>
 #include <stdlib.h>
+#include "../../objc-obj-c++-shared/objc-test-suite-types.h"
 
 @interface NSArray
 {

diff --git a/gcc/testsuite/objc.dg/attributes/proto-attribute-2.m b/gcc/testsuite/objc.dg/attributes/proto-attribute-2.m
index 1e81c0b..b23b81d 100644 (file)
--- a/gcc/testsuite/objc.dg/attributes/proto-attribute-2.m
+++ b/gcc/testsuite/objc.dg/attributes/proto-attribute-2.m
@@ -6,7 +6,6 @@
 
 #include <stdlib.h>
 #include <objc/objc.h>
-#include <objc/runtime.h>
 
 __attribute__ ((deprecated))
 @protocol DeprecatedProtocol1;

diff --git a/gcc/testsuite/objc.dg/attributes/proto-attribute-3.m b/gcc/testsuite/objc.dg/attributes/proto-attribute-3.m
index f509bb7..2be286e 100644 (file)
--- a/gcc/testsuite/objc.dg/attributes/proto-attribute-3.m
+++ b/gcc/testsuite/objc.dg/attributes/proto-attribute-3.m
@@ -6,7 +6,6 @@
 
 #include <stdlib.h>
 #include <objc/objc.h>
-#include <objc/runtime.h>
 
 __attribute__ ((deprecated))
 @protocol DeprecatedProtocol1

diff --git a/gcc/testsuite/objc.dg/property/property.exp b/gcc/testsuite/objc.dg/property/property.exp
index 350c4b8..e877301 100644 (file)
--- a/gcc/testsuite/objc.dg/property/property.exp
+++ b/gcc/testsuite/objc.dg/property/property.exp
@@ -33,8 +33,9 @@ set tests [lsort [glob -nocomplain $srcdir/$subdir/*.m]]
 # Main loop.
 dg-runtest $tests "-fgnu-runtime" $DEFAULT_CFLAGS
 
-# darwin targets can also run code with the NeXT runtime.
-if [istarget "*-*-darwin*" ] {
+# Darwin targets can also run code with the NeXT runtime.
+# but Properties are not supported by the runtime lib before Darwin 9.
+if [istarget "*-*-darwin\[9123\]*" ] {
   dg-runtest $tests "-fnext-runtime" $DEFAULT_CFLAGS
 }
 

diff --git a/gcc/testsuite/objc.dg/special/load-category-1.m b/gcc/testsuite/objc.dg/special/load-category-1.m
index bfd6373..cb22143 100644 (file)
--- a/gcc/testsuite/objc.dg/special/load-category-1.m
+++ b/gcc/testsuite/objc.dg/special/load-category-1.m
@@ -4,7 +4,6 @@
 
 #include <stdlib.h>
 #include <objc/objc.h>
-#include <objc/runtime.h>
 
 #include "load-category-1.h"
 

diff --git a/gcc/testsuite/objc.dg/special/load-category-1a.m b/gcc/testsuite/objc.dg/special/load-category-1a.m
index f516e7d..cdcb7d8 100644 (file)
--- a/gcc/testsuite/objc.dg/special/load-category-1a.m
+++ b/gcc/testsuite/objc.dg/special/load-category-1a.m
@@ -2,7 +2,6 @@
 
 #include <stdlib.h>
 #include <objc/objc.h>
-#include <objc/runtime.h>
 
 #include "load-category-1.h"
 

diff --git a/gcc/testsuite/objc.dg/special/load-category-2.m b/gcc/testsuite/objc.dg/special/load-category-2.m
index 6fd99fd..7dc7459 100644 (file)
--- a/gcc/testsuite/objc.dg/special/load-category-2.m
+++ b/gcc/testsuite/objc.dg/special/load-category-2.m
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <objc/objc.h>
-#include <objc/runtime.h>
 
 #include "load-category-2.h"
 

diff --git a/gcc/testsuite/objc.dg/special/load-category-2a.m b/gcc/testsuite/objc.dg/special/load-category-2a.m
index f4e0af1..6b81240 100644 (file)
--- a/gcc/testsuite/objc.dg/special/load-category-2a.m
+++ b/gcc/testsuite/objc.dg/special/load-category-2a.m
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <objc/objc.h>
-#include <objc/runtime.h>
 
 #include "load-category-2.h"
 

diff --git a/gcc/testsuite/objc.dg/special/load-category-3.m b/gcc/testsuite/objc.dg/special/load-category-3.m
index c32f3ef..b89d8f1 100644 (file)
--- a/gcc/testsuite/objc.dg/special/load-category-3.m
+++ b/gcc/testsuite/objc.dg/special/load-category-3.m
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <objc/objc.h>
-#include <objc/runtime.h>
 
 #include "load-category-3.h"
 

diff --git a/gcc/testsuite/objc.dg/special/load-category-3a.m b/gcc/testsuite/objc.dg/special/load-category-3a.m
index a16fe6f..5ce5fac 100644 (file)
--- a/gcc/testsuite/objc.dg/special/load-category-3a.m
+++ b/gcc/testsuite/objc.dg/special/load-category-3a.m
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <objc/objc.h>
-#include <objc/runtime.h>
 
 #include "load-category-3.h"