From: Janis Johnson <janis187@us.ibm.com>
Date: Tue, 20 Dec 2005 19:08:30 +0000 (+0000)
Subject: backport: gcc-dg.exp: Clear xfail data in dg-test
X-Git-Tag: releases/gcc-3.4.6~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07fd715f3e31eff672e8ba005645f3f8d47ea321;p=thirdparty%2Fgcc.git

backport: gcc-dg.exp: Clear xfail data in dg-test

	Backport:
	2005-01-24  Janis Johnson  <janis187@us.ibm.com>
	* lib/gcc-dg.exp: Clear xfail data in dg-test

From-SVN: r108864
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index de6f2c197e56..50caf633484d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2005-12-20  Janis Johnson  <janis187@us.ibm.com>
 
+	Backport:
+	2005-01-24  Janis Johnson  <janis187@us.ibm.com>
+	* lib/gcc-dg.exp: Clear xfail data in dg-test
+
 	* lib/gcc-dg.exp: Remove dg-skip-if and dg-xfail-if, now in
 	target-supports-dg.exp.
 
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index e12224d4b377..429155c9fe16 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -388,17 +388,24 @@ if { [info procs saved-dg-test] == [list] } {
 	global additional_sources
 	global additional_prunes
 	global errorInfo
+	global compiler_conditional_xfail_data
 
 	if { [ catch { eval saved-dg-test $args } errmsg ] } {
 	    set saved_info $errorInfo
 	    set additional_files ""
 	    set additional_sources ""
 	    set additional_prunes ""
+	    if [info exists compiler_conditional_xfail_data] {
+		unset compiler_conditional_xfail_data
+	    }
 	    error $errmsg $saved_info
 	}
 	set additional_files ""
 	set additional_sources ""
 	set additional_prunes ""
+	if [info exists compiler_conditional_xfail_data] {
+	    unset compiler_conditional_xfail_data
+	}
     }
 }
 set additional_prunes ""