This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[3.4 PATCH] backport testsuite fix for skipped tests


This 3.4 patch clears xfail flags so that flags that were set for a test
that was skipped will not be used for the next test that is run.  This
functionality was added to mainline a couple of months ago, and changed
in mainline today to match what's done here.

There are no tests in 3.4 that are currently affected by that, but that
could change if dg-skip-if is available in that branch (see my next
patch).  Tested by running C and C++ testsuites for powerpc64-linux
with -m32 and -m64 with "make -j 4 check", and with special-purpose
tests for directives.

OK for 3.4?  As testsuite maintainer can I make decisions like this for
a release branch?

2005-01-24  Janis Johnson  <janis187@us.ibm.com>

	* lib/gcc-dg.exp (dg-test): Clear xfail flags.

--- gcc/testsuite/lib/gcc-dg.exp.orig	2005-01-24 10:37:19.000000000 -0800
+++ gcc/testsuite/lib/gcc-dg.exp	2005-01-24 10:39:07.000000000 -0800
@@ -399,17 +399,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 ""


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]