pr32000-2.c: Use dg-skip-if for target expression.

	* gcc.target/i386/pr32000-2.c: Use dg-skip-if for target expression.
	* gcc.target/i386/stackalign/return-3.c: Ditto.
	* gcc.target/sparc/ultrasp3.c: Ditto.
	* lib/target-supports-dg.exp (dg-require-effective-target): Error
	if argument is not a single effective-target keyword.

From-SVN: r139039

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7c0b910643a7bc76ad675faf836ea0dc5880fa22..83d6afe1d1a13a921a3fb713bc3f29afba4d0e8b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2008-08-12  Janis Johnson  <janis187@us.ibm.com>
 
+       * gcc.target/i386/pr32000-2.c: Use dg-skip-if for target expression.
+       * gcc.target/i386/stackalign/return-3.c: Ditto.
+       * gcc.target/sparc/ultrasp3.c: Ditto.
+       * lib/target-supports-dg.exp (dg-require-effective-target): Error
+       if argument is not a single effective-target keyword.
+
        PR testsuite/36087
        * gcc.dg/var-expand3.c: Fix name of dump file.
 

diff --git a/gcc/testsuite/gcc.target/i386/pr32000-2.c b/gcc/testsuite/gcc.target/i386/pr32000-2.c
index 7230258045d83787e87fd0b197227b53f45eca6a..639b121dc1e18d3b6c57b5117fe0dfc4509d9c7a 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr32000-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr32000-2.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-require-effective-target ilp32 && dfp } */
+/* { dg-skip-if "" { ! { ilp32 && dfp } } } */
 /* { dg-options "-O -msse2 -std=gnu99 -mpreferred-stack-boundary=2" } */
 
 #include "sse2-check.h"

diff --git a/gcc/testsuite/gcc.target/i386/stackalign/return-3.c b/gcc/testsuite/gcc.target/i386/stackalign/return-3.c
index d8ab69bbea001ddcd50ddc60c63aa3ec84bbe305..8a682b8fca6011c5734959691771cf9dd8c0c56d 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/stackalign/return-3.c
+++ b/gcc/testsuite/gcc.target/i386/stackalign/return-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target ilp32 && dfp } */
+/* { dg-skip-if "" { ! { ilp32 && dfp } } } */
 /* { dg-options "-msse -std=gnu99 -mpreferred-stack-boundary=2" } */
 
 /* This compile only test is to detect an assertion failure in stack branch

diff --git a/gcc/testsuite/gcc.target/sparc/ultrasp3.c b/gcc/testsuite/gcc.target/sparc/ultrasp3.c
index 1e028add878c871e1bb650e1eb0343af36f58fe9..87025881361c2dcfe38922ad247b642d04bc55e6 100644 (file)
--- a/gcc/testsuite/gcc.target/sparc/ultrasp3.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp3.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-require-effective-target ilp32 && ultrasparc_hw } */
+/* { dg-skip-if "" { ! { ilp32 && ultrasparc_hw } } } */
 /* { dg-options "-mcpu=ultrasparc -mv8plus" } */
 
 extern void abort (void);

diff --git a/gcc/testsuite/lib/target-supports-dg.exp b/gcc/testsuite/lib/target-supports-dg.exp
index 4bff5fa44244e0beeb26fabdfddf9f30c18ec12e..0f8c7255b557ab624e8a3519dcaf1f53cade862d 100644 (file)
--- a/gcc/testsuite/lib/target-supports-dg.exp
+++ b/gcc/testsuite/lib/target-supports-dg.exp
@@ -117,6 +117,9 @@ proc dg-require-named-sections { args } {
 
 proc dg-require-effective-target { args } {
     set args [lreplace $args 0 0]
+    if { [llength $args] != 1 } {
+       error "syntax error, need a single effective-target keyword"
+    }
     if { ![is-effective-target [lindex $args 0]] } {
        upvar dg-do-what dg-do-what
         set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]