From: Iain Sandoe Date: Thu, 7 Oct 2010 14:40:33 +0000 (+0000) Subject: foreach-1.m: Adjust for -fnext-runtime compatibility. X-Git-Tag: releases/gcc-4.6.0~3784 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4c37c1616cacf3e879e53eaefb675746173ebd7;p=thirdparty%2Fgcc.git foreach-1.m: Adjust for -fnext-runtime compatibility. gcc/testsuite: * objc.dg/foreach-1.m: Adjust for -fnext-runtime compatibility. * objc.dg/foreach-2.m: Likewise. * objc.dg/foreach-3.m: Likewise. * objc.dg/foreach-4.m: Likewise. * objc.dg/foreach-5.m: Likewise. * objc.dg/foreach-6.m: Likewise. * objc.dg/foreach-7.m: Likewise. * objc.dg/objc-foreach-4.m: Likewise. * objc.dg/objc-foreach-5.m: Likewise. From-SVN: r165117 --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 515582ed7fe2..2f1f7616b1a3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,8 +1,20 @@ +2010-10-07 Iain Sandoe + + * objc.dg/foreach-1.m: Adjust for -fnext-runtime compatibility. + * objc.dg/foreach-2.m: Likewise. + * objc.dg/foreach-3.m: Likewise. + * objc.dg/foreach-4.m: Likewise. + * objc.dg/foreach-5.m: Likewise. + * objc.dg/foreach-6.m: Likewise. + * objc.dg/foreach-7.m: Likewise. + * objc.dg/objc-foreach-4.m: Likewise. + * objc.dg/objc-foreach-5.m: Likewise. + 2010-10-07 Richard Guenther PR middle-end/45869 * gcc.dg/torture/pr45869.c: New testcase. - + 2010-10-07 Iain Sandoe * objc.dg/set-not-used-1.m: New diff --git a/gcc/testsuite/objc.dg/foreach-1.m b/gcc/testsuite/objc.dg/foreach-1.m index 541b5835c356..dd1d8cf985d9 100644 --- a/gcc/testsuite/objc.dg/foreach-1.m +++ b/gcc/testsuite/objc.dg/foreach-1.m @@ -1,12 +1,12 @@ /* Test basic Objective-C foreach syntax. This tests iterations that do nothing. */ -/* FIXME: Run this test with the NeXT runtime as well. */ -/* { dg-skip-if "" { *-*-* } { "-fnext-runtime" } { "" } } */ /* { dg-do run } */ +/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ +/* { dg-additional-sources "../objc-obj-c++-shared/Object1.m" } */ + +#import "../objc-obj-c++-shared/Object1.h" -#include -#include extern void abort (void); /* struct __objcFastEnumerationState diff --git a/gcc/testsuite/objc.dg/foreach-2.m b/gcc/testsuite/objc.dg/foreach-2.m index e15850218139..1e9c515f6005 100644 --- a/gcc/testsuite/objc.dg/foreach-2.m +++ b/gcc/testsuite/objc.dg/foreach-2.m @@ -1,15 +1,19 @@ /* Test basic Objective-C foreach syntax. This tests iterations, with the basic syntax 'for (object in array) statements' */ -/* FIXME: Run this test with the NeXT runtime as well. */ -/* { dg-skip-if "" { *-*-* } { "-fnext-runtime" } { "" } } */ /* { dg-do run } */ +/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ +/* { dg-additional-sources "../objc-obj-c++-shared/Object1.m" } */ -#include -#include +#import "../objc-obj-c++-shared/Object1.h" +#import "../objc-obj-c++-shared/next-mapping.h" +#ifndef __NEXT_RUNTIME__ #include +#endif + +extern int printf (const char *, ...); #include -extern void abort (void); + /* struct __objcFastEnumerationState { diff --git a/gcc/testsuite/objc.dg/foreach-3.m b/gcc/testsuite/objc.dg/foreach-3.m index 893631fd423c..da23f83799b7 100644 --- a/gcc/testsuite/objc.dg/foreach-3.m +++ b/gcc/testsuite/objc.dg/foreach-3.m @@ -1,18 +1,21 @@ /* Test basic Objective-C foreach syntax. This tests the mutation. */ -/* FIXME: Run this test with the NeXT runtime as well. */ -/* { dg-skip-if "" { *-*-* } { "-fnext-runtime" } { "" } } */ +/* { dg-do compile } */ + /* FIXME: This test should be run, and it succeeds if the program aborts at the right time (when the mutation happens). It currently works, but how do we tell the testsuite to test for it ? */ -/* { dg-do compile } */ -#include -#include +#import "../objc-obj-c++-shared/Object1.h" +#import "../objc-obj-c++-shared/next-mapping.h" +#ifndef __NEXT_RUNTIME__ #include +#endif + +extern int printf (const char *, ...); #include -extern void abort (void); + /* struct __objcFastEnumerationState { diff --git a/gcc/testsuite/objc.dg/foreach-4.m b/gcc/testsuite/objc.dg/foreach-4.m index c9cd977b0958..b6cfe2c0c659 100644 --- a/gcc/testsuite/objc.dg/foreach-4.m +++ b/gcc/testsuite/objc.dg/foreach-4.m @@ -1,15 +1,19 @@ /* Test basic Objective-C foreach syntax. This tests iterations, with the declaration syntax 'for (id object in array) statements' */ -/* FIXME: Run this test with the NeXT runtime as well. */ -/* { dg-skip-if "" { *-*-* } { "-fnext-runtime" } { "" } } */ /* { dg-do run } */ +/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ +/* { dg-additional-sources "../objc-obj-c++-shared/Object1.m" } */ -#include -#include +#import "../objc-obj-c++-shared/Object1.h" +#import "../objc-obj-c++-shared/next-mapping.h" +#ifndef __NEXT_RUNTIME__ #include +#endif + +extern int printf (const char *, ...); #include -extern void abort (void); + /* struct __objcFastEnumerationState { diff --git a/gcc/testsuite/objc.dg/foreach-5.m b/gcc/testsuite/objc.dg/foreach-5.m index b3579970ea08..f6d34f41399a 100644 --- a/gcc/testsuite/objc.dg/foreach-5.m +++ b/gcc/testsuite/objc.dg/foreach-5.m @@ -1,15 +1,18 @@ /* Test basic Objective-C foreach syntax. This tests that if you define your own NSFastEnumeration struct, the compiler picks it up. */ -/* FIXME: Run this test with the NeXT runtime as well. */ -/* { dg-skip-if "" { *-*-* } { "-fnext-runtime" } { "" } } */ /* { dg-do run } */ +/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ +/* { dg-additional-sources "../objc-obj-c++-shared/Object1.m" } */ -#include -#include +#import "../objc-obj-c++-shared/Object1.h" +#import "../objc-obj-c++-shared/next-mapping.h" +#ifndef __NEXT_RUNTIME__ #include +#endif + +extern int printf (const char *, ...); #include -extern void abort (void); typedef struct { diff --git a/gcc/testsuite/objc.dg/foreach-6.m b/gcc/testsuite/objc.dg/foreach-6.m index 7a6b9609d8a1..d368390cbcab 100644 --- a/gcc/testsuite/objc.dg/foreach-6.m +++ b/gcc/testsuite/objc.dg/foreach-6.m @@ -1,11 +1,9 @@ /* Test basic Objective-C foreach syntax. This tests warnings and errors. */ -/* FIXME: Run this test with the NeXT runtime as well. */ -/* { dg-skip-if "" { *-*-* } { "-fnext-runtime" } { "" } } */ /* { dg-do compile } */ -#include -#include -extern void abort (void); +#import "../objc-obj-c++-shared/Object1.h" +#import "../objc-obj-c++-shared/next-mapping.h" + /* struct __objcFastEnumerationState { diff --git a/gcc/testsuite/objc.dg/foreach-7.m b/gcc/testsuite/objc.dg/foreach-7.m index 42bca82e3b95..5da940f620ee 100644 --- a/gcc/testsuite/objc.dg/foreach-7.m +++ b/gcc/testsuite/objc.dg/foreach-7.m @@ -1,11 +1,9 @@ /* Test basic Objective-C foreach syntax. This tests warnings and errors. */ -/* FIXME: Run this test with the NeXT runtime as well. */ -/* { dg-skip-if "" { *-*-* } { "-fnext-runtime" } { "" } } */ /* { dg-do compile } */ -#include -#include -extern void abort (void); +#import "../objc-obj-c++-shared/Object1.h" +#import "../objc-obj-c++-shared/next-mapping.h" + /* struct __objcFastEnumerationState { diff --git a/gcc/testsuite/objc.dg/objc-foreach-4.m b/gcc/testsuite/objc.dg/objc-foreach-4.m index 76e429e69417..1a6c101f069e 100644 --- a/gcc/testsuite/objc.dg/objc-foreach-4.m +++ b/gcc/testsuite/objc.dg/objc-foreach-4.m @@ -1,7 +1,9 @@ /* Test for valid objc objects used in a for-each statement. */ /* FIXME: Run this test with the GNU runtime as well. */ -/* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */ /* { dg-do compile { target *-*-darwin* } } */ +/* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */ + +#include #include // gcc -o foo foo.m -framework Foundation diff --git a/gcc/testsuite/objc.dg/objc-foreach-5.m b/gcc/testsuite/objc.dg/objc-foreach-5.m index 95a950375a49..26c2dfce8e79 100644 --- a/gcc/testsuite/objc.dg/objc-foreach-5.m +++ b/gcc/testsuite/objc.dg/objc-foreach-5.m @@ -1,6 +1,8 @@ /* FIXME: Run this test with the GNU runtime as well. */ -/* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */ /* { dg-do compile { target *-*-darwin* } } */ +/* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */ + +#include #import NSArray * createTestVictim(unsigned capacity) {