* lib/gcc-dg.exp (dg-xfail-if): Ignore if skipping the test.

From-SVN: r90485

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 776f8e4e4480e68f7e6379da85a8e63cb36da419..0849f1d16047ba7362df8c8e5a638d038c3486d1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-11  Janis Johnson  <janis187@us.ibm.com>
+
+       * lib/gcc-dg.exp (dg-xfail-if): Ignore if skipping the test.
+
 2004-11-11  Nathan Sidwell  <nathan@codesourcery.com>
 
        PR target/16457

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index be9169d50c1d6b27e21666d027e79d7b15ac25fa..81fbd04833036e190297f9b5900a93f5d0f10aa7 100644 (file)
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -445,6 +445,12 @@ proc dg-prune-output { args } {
 # Like check_conditional_xfail, but callable from a dg test.
 
 proc dg-xfail-if { args } {
+    # Don't change anything if we're already skipping the test.
+    upvar dg-do-what dg-do-what
+    if { [lindex ${dg-do-what} 1] == "N" } {
+      return
+    }
+
     set args [lreplace $args 0 0]
     set selector "target [join [lindex $args 1]]"
     if { [dg-process-target $selector] == "S" } {