Commit f4b251a6 by Jason Merrill Committed by Jason Merrill

scanasm.exp (scan-assembler): Use upvar, not uplevel.

        * lib/scanasm.exp (scan-assembler): Use upvar, not uplevel.
        (scan-assembler-not, scan-assembler-dem): Likewise.
        (scan-assembler-dem-not): Likewise.

From-SVN: r53508
parent ff48be5c
2002-05-16 Jason Merrill <jason@redhat.com>
* lib/scanasm.exp (scan-assembler): Use upvar, not uplevel.
(scan-assembler-not, scan-assembler-dem): Likewise.
(scan-assembler-dem-not): Likewise.
2002-05-15 Richard Henderson <rth@redhat.com> 2002-05-15 Richard Henderson <rth@redhat.com>
* gcc.dg/weak-5.c (vfoo1c, vfoo1g): Warn here. * gcc.dg/weak-5.c (vfoo1c, vfoo1g): Warn here.
......
...@@ -40,7 +40,7 @@ proc scan-assembler { args } { ...@@ -40,7 +40,7 @@ proc scan-assembler { args } {
# This assumes that we are two frames down from dg-test, and that # This assumes that we are two frames down from dg-test, and that
# it still stores the filename of the testcase in a local variable "name". # it still stores the filename of the testcase in a local variable "name".
# A cleaner solution would require a new dejagnu release. # A cleaner solution would require a new dejagnu release.
set testcase [uplevel 2 { expr { $name } }] upvar 2 name testcase
# This must match the rule in gcc-dg.exp. # This must match the rule in gcc-dg.exp.
set output_file "[file rootname [file tail $testcase]].s" set output_file "[file rootname [file tail $testcase]].s"
...@@ -75,7 +75,7 @@ proc scan-assembler-not { args } { ...@@ -75,7 +75,7 @@ proc scan-assembler-not { args } {
} }
} }
set testcase [uplevel 2 { expr { $name } }] upvar 2 name testcase
set output_file "[file rootname [file tail $testcase]].s" set output_file "[file rootname [file tail $testcase]].s"
set fd [open $output_file r] set fd [open $output_file r]
...@@ -120,7 +120,7 @@ proc scan-assembler-dem { args } { ...@@ -120,7 +120,7 @@ proc scan-assembler-dem { args } {
verbose -log "c++filt is $cxxfilt" verbose -log "c++filt is $cxxfilt"
} }
set testcase [uplevel 2 { expr { $name } }] upvar 2 name testcase
set output_file "[file rootname [file tail $testcase]].s" set output_file "[file rootname [file tail $testcase]].s"
set fd [open "| $cxxfilt < $output_file" r] set fd [open "| $cxxfilt < $output_file" r]
...@@ -172,7 +172,7 @@ proc scan-assembler-dem-not { args } { ...@@ -172,7 +172,7 @@ proc scan-assembler-dem-not { args } {
verbose -log "c++filt is $cxxfilt" verbose -log "c++filt is $cxxfilt"
} }
set testcase [uplevel 2 { expr { $name } }] upvar 2 name testcase
set output_file "[file rootname [file tail $testcase]].s" set output_file "[file rootname [file tail $testcase]].s"
set fd [open "| $cxxfilt < $output_file" r] set fd [open "| $cxxfilt < $output_file" r]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment