* lib/framework.exp (pass): make compiler_conditional_xfail_data

a global, corresponding to a recent change to 'proc fail'.

diff --git a/dejagnu/lib/framework.exp b/dejagnu/lib/framework.exp
index d93ae01..36706ff 100644 (file)
--- a/dejagnu/lib/framework.exp
+++ b/dejagnu/lib/framework.exp
@@ -672,14 +672,14 @@ proc record_test { type message args } {
 # Record that a test has passed
 #
 proc pass { 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 {