This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
PATCH to testsuite/lib/scanasm.exp
- From: Jason Merrill <jason at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 16 May 2002 06:09:43 +0100
- Subject: PATCH to testsuite/lib/scanasm.exp
Minor tidying.
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.
*** scanasm.exp.~1~ Thu May 16 05:53:04 2002
--- scanasm.exp Thu May 9 09:26:34 2002
*************** proc scan-assembler { args } {
*** 40,46 ****
# 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".
# A cleaner solution would require a new dejagnu release.
! set testcase [uplevel 2 { expr { $name } }]
# This must match the rule in gcc-dg.exp.
set output_file "[file rootname [file tail $testcase]].s"
--- 40,46 ----
# 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".
# A cleaner solution would require a new dejagnu release.
! upvar 2 name testcase
# This must match the rule in gcc-dg.exp.
set output_file "[file rootname [file tail $testcase]].s"
*************** proc scan-assembler-not { args } {
*** 75,81 ****
}
}
! set testcase [uplevel 2 { expr { $name } }]
set output_file "[file rootname [file tail $testcase]].s"
set fd [open $output_file r]
--- 75,81 ----
}
}
! upvar 2 name testcase
set output_file "[file rootname [file tail $testcase]].s"
set fd [open $output_file r]
*************** proc scan-assembler-dem { args } {
*** 120,126 ****
verbose -log "c++filt is $cxxfilt"
}
! set testcase [uplevel 2 { expr { $name } }]
set output_file "[file rootname [file tail $testcase]].s"
set fd [open "| $cxxfilt < $output_file" r]
--- 120,126 ----
verbose -log "c++filt is $cxxfilt"
}
! upvar 2 name testcase
set output_file "[file rootname [file tail $testcase]].s"
set fd [open "| $cxxfilt < $output_file" r]
*************** proc scan-assembler-dem-not { args } {
*** 172,178 ****
verbose -log "c++filt is $cxxfilt"
}
! set testcase [uplevel 2 { expr { $name } }]
set output_file "[file rootname [file tail $testcase]].s"
set fd [open "| $cxxfilt < $output_file" r]
--- 172,178 ----
verbose -log "c++filt is $cxxfilt"
}
! upvar 2 name testcase
set output_file "[file rootname [file tail $testcase]].s"
set fd [open "| $cxxfilt < $output_file" r]