[angela@cygnus.com: compiler_conditional_xfail_data dejagnu patch ]

[Geoff Keating <geoffk at cygnus dot com>]

I'm just about to commit the attached patch to c-torture as an obvious
fix, to go with the corresponding patch to dejagnu.  Angela said:

------- Start of forwarded message -------
The following patches fix the dejagnu check_conditional_xfail routine.
Previously, the routine used uplevel{} to determine the value
of $compiler_conditional_xfail_data rather than making it a global.
Changes to the test harness have caused this to no longer work as
expected.  The fix is to make $compiler_conditional_xfail_data global.

c-torture is the only set of tests I can find that use this so this
should fix all uses.
------- End of forwarded message -------

I would CC the dejagnu mailing list, but there doesn't seem to be one.

The feature is not used much.  In fact, it's only used for the m32r at
present.  m32r users can blame me if it breaks them :-).

-- 
- Geoffrey Keating <geoffk@cygnus.com>

===File ~/patches/cygnus/ang-cxfail-gcc.patch===============
gcc/testsuite/ChangeLog
2000-07-08  Angela Marie Thomas <angela@cygnus.com>

	* lib/c-torture.exp: Make compiler_conditional_xfail_data global.



Index: gcc/testsuite/lib/c-torture.exp
===================================================================
RCS file: /cvs/cvsfiles/devo/gcc/testsuite/lib/c-torture.exp,v
retrieving revision 1.71
diff -u -p -r1.71 c-torture.exp
--- gcc/testsuite/lib/c-torture.exp	1999/09/01 00:13:37	1.71
+++ gcc/testsuite/lib/c-torture.exp	2000/07/08 22:09:04
@@ -98,7 +98,7 @@ proc c-torture-compile { src option } {
 # to more than 14 chars.
 #
 proc c-torture-execute { src args } {
-    global tmpdir tool srcdir output output
+    global tmpdir tool srcdir output compiler_conditional_xfail_data
 
     if { [llength $args] > 0 } {
 	set additional_flags [lindex $args 0];

============================================================

===File ~/patches/cygnus/ang-cxfail-deja.patch==============
dejagnu/ChangeLog
2000-07-08  Angela Marie Thomas <angela@cygnus.com>

	* lib/framework.exp: Use compiler_conditional_xfail_data as a global
	rather than assuming it's set in the level above us.


Index: dejagnu/lib/framework.exp
===================================================================
RCS file: /cvs/cvsfiles/devo/dejagnu/lib/framework.exp,v
retrieving revision 1.68
diff -u -p -r1.68 framework.exp
--- dejagnu/lib/framework.exp	1999/06/08 14:46:41	1.68
+++ dejagnu/lib/framework.exp	2000/07/08 22:09:03
@@ -693,14 +693,14 @@ proc pass { message } {
 # Record that a test has failed
 #
 proc fail { message } {
-    global xfail_flag
+    global xfail_flag compiler_conditional_xfail_data
 
     # if we have a conditional xfail setup, then see if our compiler flags match
-    if [uplevel {info exists compiler_conditional_xfail_data}] {
-	if [uplevel {check_conditional_xfail $compiler_conditional_xfail_data}] {
+    if [ info exists compiler_conditional_xfail_data ] {
+	if [check_conditional_xfail $compiler_conditional_xfail_data] {
 	    set xfail_flag 1
 	}
-	uplevel {unset compiler_conditional_xfail_data}
+	unset compiler_conditional_xfail_data
     }
 
     if $xfail_flag {

============================================================