diff options
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/testsuite/lib/utils-lib.exp | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 3ee5929..b8e94d2 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2017-05-19 Maciej W. Rozycki <macro@imgtec.com> + + * testsuite/lib/utils-lib.exp (run_dump_test): Handle the `dump' + option. + 2017-05-19 Jose E. Marchesi <jose.marchesi@oracle.com> * NEWS: Mention the SPARC M8 support. diff --git a/binutils/testsuite/lib/utils-lib.exp b/binutils/testsuite/lib/utils-lib.exp index 61f98e1..40fd98b 100644 --- a/binutils/testsuite/lib/utils-lib.exp +++ b/binutils/testsuite/lib/utils-lib.exp @@ -214,6 +214,11 @@ proc exe_ext {} { # 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. # +# 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... # Run this test only on a specified list of targets. More precisely, # each glob in the space-separated list is passed to "istarget"; if @@ -299,6 +304,7 @@ proc run_dump_test { name {extra_options {}} } { set opts(PROG) {} set opts(DUMPPROG) {} set opts(source) {} + set opts(dump) {} set opts(target) {} set opts(not-target) {} set opts(skip) {} @@ -456,6 +462,12 @@ proc run_dump_test { name {extra_options {}} } { set srcfile $srcdir/$subdir/$opts(source) } + if { $opts(dump) == "" } { + set dumpfile ${file}.d + } else { + set dumpfile $srcdir/$subdir/$opts(dump) + } + if { $opts(as) == "binary" } { while {[file type $srcfile] eq "link"} { set newfile [file readlink $srcfile] @@ -535,7 +547,7 @@ proc run_dump_test { name {extra_options {}} } { } verbose_eval {[file_contents "tmpdir/dump.out"]} 3 - if { [regexp_diff "tmpdir/dump.out" "${file}.d"] } then { + if { [regexp_diff "tmpdir/dump.out" "${dumpfile}"] } then { fail $testname verbose "output is [file_contents "tmpdir/dump.out"]" 2 return |