2010-04-26 Iain Sandoe <iain.sandoe@sandoe-acoustics.co.uk>

	PR testsuite/35165
	* obj-c++.dg/stubify-2.mm: Restrict to ilp32 targets.  Require
	Darwin8/OSX10.4 - compatible code generation.
	Use scan-rtl-dump.
	* obj-c++.dg/stubify-1.mm: Ditto.
	* lib/objc-torture.exp: Do not require link success for
	"trivial.m" in the runtime checks when dowhat = 'compile'.
	* lib/dg-pch.exp: (dg-flags-pch): New Proc.
	* objc.dg/stubify-1.m:  Restrict to ilp32 targets.  Require
	Darwin8/OSX10.4 - compatible code generation.
	* objc.dg/stubify-2.m: Ditto.
	* objc.dg/symtab-1.m: Match '.quad' for m64 code.
	* objc.dg/next-runtime-1.m: Ditto.
	* objc.dg/stret-2.m: Restrict to ilp32 targets.
	* objc.dg/pch/pch.exp: Apply tests to both Gnu and NeXT
	runtimes on Darwin.

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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6c44188..4351007 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2010-04-26  Iain Sandoe  <iain.sandoe@sandoe-acoustics.co.uk>
+
+       PR testsuite/35165
+       * obj-c++.dg/stubify-2.mm: Restrict to ilp32 targets.  Require
+       Darwin8/OSX10.4 - compatible code generation.
+       Use scan-rtl-dump.
+       * obj-c++.dg/stubify-1.mm: Ditto.
+       * lib/objc-torture.exp: Do not require link success for
+       "trivial.m" in the runtime checks when dowhat = 'compile'.
+       * lib/dg-pch.exp: (dg-flags-pch): New Proc.
+       * objc.dg/stubify-1.m:  Restrict to ilp32 targets.  Require
+       Darwin8/OSX10.4 - compatible code generation.
+       * objc.dg/stubify-2.m: Ditto.
+       * objc.dg/symtab-1.m: Match '.quad' for m64 code.
+       * objc.dg/next-runtime-1.m: Ditto.
+       * objc.dg/stret-2.m: Restrict to ilp32 targets.
+       * objc.dg/pch/pch.exp: Apply tests to both Gnu and NeXT
+       runtimes on Darwin.
+
 2010-04-26  Jack Howarth <howarth@bromo.med.uc.edu>
 
        PR 43715

diff --git a/gcc/testsuite/lib/objc-torture.exp b/gcc/testsuite/lib/objc-torture.exp
index 0b6362b..a3d1ef2 100644 (file)
--- a/gcc/testsuite/lib/objc-torture.exp
+++ b/gcc/testsuite/lib/objc-torture.exp
@@ -46,28 +46,55 @@ proc objc-set-runtime-options { dowhat args } {
            lappend options $args
        }
        verbose "options $options"
-       set test_obj "trivial.exe"
-       set comp_output [objc_target_compile \
-       "$srcdir/$subdir/trivial.m" $test_obj executable $options]
-
-       # If we get any error, then we failed.
-       if ![string match "" $comp_output] then {
-           remote_file build delete $test_obj
-           continue;
-       }
        if [info exists dowhat] {
-           if { $dowhat == "execute" } {
-               set result [objc_load "$tmpdir/$test_obj" "" ""]
-               set status [lindex $result 0]
-               set output [lindex $result 1]
-               if { $status != "pass" } {
-                   remote_file build delete $test_obj
-                   verbose -log "trivial execute failed with $status $output"
-                   continue;
-               }
+          switch $dowhat {
+           "compile" {
+             set compile_type "assembly"
+             set output_file "trivial.s"
+             set comp_output [objc_target_compile \
+               "$srcdir/$subdir/trivial.m" "$output_file" "$compile_type" $options]
+
+             remote_file build delete $output_file
+             # If we get any error, then we failed.
+             if ![string match "" $comp_output] then {
+               continue;
+             }
+           }
+           "execute" {
+             set test_obj "trivial.exe"
+             set comp_output [objc_target_compile \
+               "$srcdir/$subdir/trivial.m" $test_obj "executable" $options]
+
+             # If we get any error, then we failed.
+             if ![string match "" $comp_output] then {
+               remote_file build delete $test_obj
+               continue;
+             }
+             set result [objc_load "$tmpdir/$test_obj" "" ""]
+             set status [lindex $result 0]
+             set output [lindex $result 1]
+             remote_file build delete $test_obj
+             if { $status != "pass" } {
+               verbose -log "trivial execute failed with $status $output"
+               continue;
+             }
+           }
+           default {
+             perror "$dowhat: not a valid objc-torture action"
+             return ""
            }
+         }
+       } else {
+         set test_obj "trivial.exe"
+         set comp_output [objc_target_compile \
+         "$srcdir/$subdir/trivial.m" $test_obj executable $options]
+
+         # If we get any error, then we failed.
+         remote_file build delete $test_obj
+         if ![string match "" $comp_output] then {
+             continue;
+         }
        }
-       remote_file build delete $test_obj
        lappend OBJC_RUNTIME_OPTIONS $type
     }
 

diff --git a/gcc/testsuite/obj-c++.dg/stubify-2.mm b/gcc/testsuite/obj-c++.dg/stubify-2.mm
index 9db573e..9968672 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/stubify-2.mm
+++ b/gcc/testsuite/obj-c++.dg/stubify-2.mm
@@ -2,7 +2,9 @@
 /* Testcase extracted from TextEdit:Document.m.  */
 
 /* { dg-do compile { target *-*-darwin* } } */
-/* { dg-options "-mdynamic-no-pic -fdump-rtl-jump" } */
+/* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-mdynamic-no-pic -fdump-rtl-jump -mmacosx-version-min=10.4" } */
 
 typedef struct objc_object { } *id ;
 int x = 41 ;
@@ -27,5 +29,5 @@ extern int bogonic (int, int, int) ;
 @end
 
 /* Any symbol_ref of an un-stubified objc_msgSend is an error; look
-   for "objc_msgSend" in quotes, without the $stub suffix.  */
-/* { dg-final { scan-file-not stubify-2.mm.147r.jump "symbol_ref.*\"objc_msgSend\"" } } */
+   for "objc_msgSend" in quotes, without the $stub suffix. */
+/* { dg-final {  scan-rtl-dump-not "symbol_ref.*\"objc_msgSend\"" "jump" } } */

diff --git a/gcc/testsuite/objc.dg/stret-2.m b/gcc/testsuite/objc.dg/stret-2.m
index ded3ae4..fccda32 100644 (file)
--- a/gcc/testsuite/objc.dg/stret-2.m
+++ b/gcc/testsuite/objc.dg/stret-2.m
@@ -4,6 +4,7 @@
 /* Contributed by Ziemowit Laski <zlaski@apple.com>.  */
 /* { dg-do compile { target *-*-darwin* } } */
 /* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-require-effective-target ilp32 } */
 
 #include "../objc-obj-c++-shared/Object1.h"
 

diff --git a/gcc/testsuite/objc.dg/stubify-1.m b/gcc/testsuite/objc.dg/stubify-1.m
index 72de75b..91bf73a 100644 (file)
--- a/gcc/testsuite/objc.dg/stubify-1.m
+++ b/gcc/testsuite/objc.dg/stubify-1.m
@@ -3,7 +3,8 @@
 
 /* { dg-do compile { target *-*-darwin* } } */
 /* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
-/* { dg-options "-Os -mdynamic-no-pic" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-Os -mdynamic-no-pic -mmacosx-version-min=10.4" } */
 
 typedef struct objc_object { } *id ;
 int x = 41 ;

diff --git a/gcc/testsuite/objc.dg/stubify-2.m b/gcc/testsuite/objc.dg/stubify-2.m
index b474d4f..eaf4b96 100644 (file)
--- a/gcc/testsuite/objc.dg/stubify-2.m
+++ b/gcc/testsuite/objc.dg/stubify-2.m
@@ -1,9 +1,10 @@
-/* All calls must be properly stubified.  */
+/* All calls must be properly stubified, m32 only.  */
 /* Testcase extracted from TextEdit:Document.m.  */
 
-/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-do compile { target powerpc*-*-darwin* } } */
 /* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
-/* { dg-options "-mdynamic-no-pic -fdump-rtl-jump" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-mdynamic-no-pic -fdump-rtl-jump -mmacosx-version-min=10.4" } */
 
 typedef struct objc_object { } *id ;
 int x = 41 ;