From: Janis Johnson <janis187@us.ibm.com>
Date: Thu, 11 Nov 2004 17:57:53 +0000 (+0000)
Subject: * lib/gcc-dg.exp (dg-xfail-if): Ignore if skipping the test.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=524136ea7b852cdcfa8f52e853c50451d229bcaf;p=gcc.git

* 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 776f8e4e448..0849f1d1604 100644
--- 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 be9169d50c1..81fbd048330 100644
--- 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" } {