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 de6f2c197e561e347e9bcb29424ca907ba5abdfc..50caf633484d5ab92a737bce56b0b7783609c350 100644 (file)
--- 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 e12224d4b3777b1a3bb74c16d756e76a105b1fcd..429155c9fe1601fd14f9dcd57cebc8bf1f153ca4 100644 (file)
--- 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 ""