* lib/gas-defs.exp (run_dump_test): Handle the "dump" option.

This commit is contained in:
Maciej W. Rozycki 2010-07-24 01:36:16 +00:00
parent dfe5355771
commit 89210bdc8f
2 changed files with 17 additions and 1 deletions

View file

@ -1,3 +1,7 @@
2010-07-24 Maciej W. Rozycki <macro@codesourcery.com>
* lib/gas-defs.exp (run_dump_test): Handle the "dump" option.
2010-07-23 Naveen.H.S <naveen.S@kpitcummins.com> 2010-07-23 Naveen.H.S <naveen.S@kpitcummins.com>
Ina Pandit <ina.pandit@kpitcummins.com> Ina Pandit <ina.pandit@kpitcummins.com>

View file

@ -418,6 +418,11 @@ proc run_dump_tests { testcases {extra_options {}} } {
# Assemble the file SOURCE.s. If omitted, this defaults to FILE.s. # Assemble the file SOURCE.s. If omitted, this defaults to FILE.s.
# This is useful if several .d files want to share a .s file. # This is useful if several .d files want to share a .s file.
# #
# dump: DUMP
# Match against DUMP.d. If omitted, this defaults to FILE.d. This
# is useful if several .d files differ by options only. Options are
# always read from FILE.d.
#
# target: GLOBS... # target: GLOBS...
# Run this test only on a specified list of targets. More precisely, # Run this test only on a specified list of targets. More precisely,
# each glob in the space-separated list is passed to "istarget"; if # each glob in the space-separated list is passed to "istarget"; if
@ -494,6 +499,7 @@ proc run_dump_test { name {extra_options {}} } {
set opts(name) {} set opts(name) {}
set opts(PROG) {} set opts(PROG) {}
set opts(source) {} set opts(source) {}
set opts(dump) {}
set opts(stderr) {} set opts(stderr) {}
set opts(error) {} set opts(error) {}
set opts(error-output) {} set opts(error-output) {}
@ -652,6 +658,12 @@ proc run_dump_test { name {extra_options {}} } {
set sourcefile $srcdir/$subdir/$opts(source) set sourcefile $srcdir/$subdir/$opts(source)
} }
if { $opts(dump) == "" } {
set dumpfile ${file}.d
} else {
set dumpfile $srcdir/$subdir/$opts(dump)
}
set cmd "$AS $ASFLAGS $opts(as) -o dump.o $sourcefile" set cmd "$AS $ASFLAGS $opts(as) -o dump.o $sourcefile"
send_log "$cmd\n" send_log "$cmd\n"
set status [gas_host_run $cmd ""] set status [gas_host_run $cmd ""]
@ -773,7 +785,7 @@ proc run_dump_test { name {extra_options {}} } {
} }
verbose_eval {[file_contents "dump.out"]} 3 verbose_eval {[file_contents "dump.out"]} 3
if { [regexp_diff "dump.out" "${file}.d"] } then { if { [regexp_diff "dump.out" "${dumpfile}"] } then {
fail $testname fail $testname
verbose "output is [file_contents "dump.out"]" 2 verbose "output is [file_contents "dump.out"]" 2
return return