* lib/ld-lib.exp (run_dump_test): Add verbose to list of globals.
Replace call to verbose_eval with a test of verbose level. If greater than 2 always dump the contents of the dumpfile. If equal to 2 only dump the contents if the regexp diff failed. (proc verbose_eval): Delete.
This commit is contained in:
parent
32de4b9db9
commit
9a2ee7fcfd
@ -1,3 +1,11 @@
|
||||
2009-03-13 Nick Clifton <nickc@redhat.com>
|
||||
|
||||
* lib/ld-lib.exp (run_dump_test): Add verbose to list of globals.
|
||||
Replace call to verbose_eval with a test of verbose level. If
|
||||
greater than 2 always dump the contents of the dumpfile. If equal
|
||||
to 2 only dump the contents if the regexp diff failed.
|
||||
(proc verbose_eval): Delete.
|
||||
|
||||
2009-03-07 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
|
||||
|
||||
* ld-elf/empty2.d: Remove xfail for hppa*-*-*.
|
||||
|
@ -629,7 +629,7 @@ proc run_dump_test { name } {
|
||||
global OBJDUMP NM AS OBJCOPY READELF LD
|
||||
global OBJDUMPFLAGS NMFLAGS ASFLAGS OBJCOPYFLAGS READELFFLAGS LDFLAGS
|
||||
global host_triplet runtests
|
||||
global env
|
||||
global env verbose
|
||||
|
||||
if [string match "*/*" $name] {
|
||||
set file $name
|
||||
@ -946,10 +946,10 @@ proc run_dump_test { name } {
|
||||
return
|
||||
}
|
||||
|
||||
verbose_eval {[file_contents $dumpfile]} 3
|
||||
if { $verbose > 2 } then { verbose "output is [file_contents $dumpfile]" 3 }
|
||||
if { [regexp_diff $dumpfile "${file}.d"] } then {
|
||||
fail $testname
|
||||
verbose "output is [file_contents $dumpfile]" 2
|
||||
if { $verbose == 2 } then { verbose "output is [file_contents $dumpfile]" 2 }
|
||||
return
|
||||
}
|
||||
|
||||
@ -1274,12 +1274,6 @@ proc run_ld_link_tests { ldtests } {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
proc verbose_eval { expr { level 1 } } {
|
||||
global verbose
|
||||
if $verbose>$level then { eval verbose "$expr" $level }
|
||||
}
|
||||
|
||||
# This definition is taken from an unreleased version of DejaGnu. Once
|
||||
# that version gets released, and has been out in the world for a few
|
||||
# months at least, it may be safe to delete this copy.
|
||||
|
Loading…
Reference in New Issue
Block a user