From 171b8e19575654ab32321eb99f3fd112663ae7fa Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 8 Jan 2019 16:47:52 +1030 Subject: run_dump_test source in build directory Some existing tests build .s and .d files for run_dump_test, using an absolute #source: line in the .d file. This patch changes that scheme a little to instead use "#source: ./..." in .d files rather than "#source: $objdir/...", which is more useful in cases where the .d file is not generated. This allows RX gas test files to be built in the build directory, rather than in a source directory (which might be read-only). binutils/ * testsuite/lib/binutils-common.exp (run_dump_test): Don't prepend $srcdir/$subdir to source file name if it starts with "./". gas/ * testsuite/gas/rx/rx.exp: Create generated test source in current directory. * testsuite/gas/rx/Xtod.d, * testsuite/gas/rx/abs.d, * testsuite/gas/rx/adc.d, * testsuite/gas/rx/add.d, * testsuite/gas/rx/and.d, * testsuite/gas/rx/bclr.d, * testsuite/gas/rx/bcnd.d, * testsuite/gas/rx/bfmov.d, * testsuite/gas/rx/bmcnd.d, * testsuite/gas/rx/bnot.d, * testsuite/gas/rx/bra.d, * testsuite/gas/rx/brk.d, * testsuite/gas/rx/bset.d, * testsuite/gas/rx/bsr.d, * testsuite/gas/rx/btst.d, * testsuite/gas/rx/clrpsw.d, * testsuite/gas/rx/cmp.d, * testsuite/gas/rx/dabs.d, * testsuite/gas/rx/dadd.d, * testsuite/gas/rx/dbt.d, * testsuite/gas/rx/dcmp.d, * testsuite/gas/rx/ddiv.d, * testsuite/gas/rx/div.d, * testsuite/gas/rx/divu.d, * testsuite/gas/rx/dmov.d, * testsuite/gas/rx/dmul.d, * testsuite/gas/rx/dneg.d, * testsuite/gas/rx/dpopm.d, * testsuite/gas/rx/dpushm.d, * testsuite/gas/rx/dround.d, * testsuite/gas/rx/dsqrt.d, * testsuite/gas/rx/dsub.d, * testsuite/gas/rx/dtoX.d, * testsuite/gas/rx/emaca.d, * testsuite/gas/rx/emsba.d, * testsuite/gas/rx/emul.d, * testsuite/gas/rx/emula.d, * testsuite/gas/rx/emulu.d, * testsuite/gas/rx/fadd.d, * testsuite/gas/rx/fcmp.d, * testsuite/gas/rx/fdiv.d, * testsuite/gas/rx/fmul.d, * testsuite/gas/rx/fsqrt.d, * testsuite/gas/rx/fsub.d, * testsuite/gas/rx/ftoi.d, * testsuite/gas/rx/ftou.d, * testsuite/gas/rx/gprel.d, * testsuite/gas/rx/int.d, * testsuite/gas/rx/itof.d, * testsuite/gas/rx/jmp.d, * testsuite/gas/rx/jsr.d, * testsuite/gas/rx/machi.d, * testsuite/gas/rx/maclh.d, * testsuite/gas/rx/maclo.d, * testsuite/gas/rx/max.d, * testsuite/gas/rx/min.d, * testsuite/gas/rx/mov.d, * testsuite/gas/rx/movco.d, * testsuite/gas/rx/movli.d, * testsuite/gas/rx/movu.d, * testsuite/gas/rx/msbhi.d, * testsuite/gas/rx/msblh.d, * testsuite/gas/rx/msblo.d, * testsuite/gas/rx/mul.d, * testsuite/gas/rx/mulhi.d, * testsuite/gas/rx/mullh.d, * testsuite/gas/rx/mullo.d, * testsuite/gas/rx/mvfacgu.d, * testsuite/gas/rx/mvfachi.d, * testsuite/gas/rx/mvfaclo.d, * testsuite/gas/rx/mvfacmi.d, * testsuite/gas/rx/mvfc.d, * testsuite/gas/rx/mvfcp.d, * testsuite/gas/rx/mvfdc.d, * testsuite/gas/rx/mvfdr.d, * testsuite/gas/rx/mvtacgu.d, * testsuite/gas/rx/mvtachi.d, * testsuite/gas/rx/mvtaclo.d, * testsuite/gas/rx/mvtc.d, * testsuite/gas/rx/mvtcp.d, * testsuite/gas/rx/mvtdc.d, * testsuite/gas/rx/neg.d, * testsuite/gas/rx/nop.d, * testsuite/gas/rx/not.d, * testsuite/gas/rx/opecp.d, * testsuite/gas/rx/or.d, * testsuite/gas/rx/pop.d, * testsuite/gas/rx/popc.d, * testsuite/gas/rx/popm.d, * testsuite/gas/rx/push.d, * testsuite/gas/rx/pushc.d, * testsuite/gas/rx/pushm.d, * testsuite/gas/rx/r-bcc.d, * testsuite/gas/rx/r-bra.d, * testsuite/gas/rx/racl.d, * testsuite/gas/rx/racw.d, * testsuite/gas/rx/rdacl.d, * testsuite/gas/rx/rdacw.d, * testsuite/gas/rx/revl.d, * testsuite/gas/rx/revw.d, * testsuite/gas/rx/rmpa.d, * testsuite/gas/rx/rolc.d, * testsuite/gas/rx/rorc.d, * testsuite/gas/rx/rotl.d, * testsuite/gas/rx/rotr.d, * testsuite/gas/rx/round.d, * testsuite/gas/rx/rstr.d, * testsuite/gas/rx/rte.d, * testsuite/gas/rx/rtfi.d, * testsuite/gas/rx/rts.d, * testsuite/gas/rx/rtsd.d, * testsuite/gas/rx/sat.d, * testsuite/gas/rx/satr.d, * testsuite/gas/rx/save.d, * testsuite/gas/rx/sbb.d, * testsuite/gas/rx/sccnd.d, * testsuite/gas/rx/scmpu.d, * testsuite/gas/rx/setpsw.d, * testsuite/gas/rx/shar.d, * testsuite/gas/rx/shll.d, * testsuite/gas/rx/shlr.d, * testsuite/gas/rx/smovb.d, * testsuite/gas/rx/smovf.d, * testsuite/gas/rx/smovu.d, * testsuite/gas/rx/sstr.d, * testsuite/gas/rx/stnz.d, * testsuite/gas/rx/stz.d, * testsuite/gas/rx/sub.d, * testsuite/gas/rx/suntil.d, * testsuite/gas/rx/swhile.d, * testsuite/gas/rx/tst.d, * testsuite/gas/rx/utof.d, * testsuite/gas/rx/wait.d, * testsuite/gas/rx/xchg.d, * testsuite/gas/rx/xor.d: Add #source line. ld/ * testsuite/ld-elf/sec64k.exp: Use . rather than $objdir in generated source file names. * testsuite/ld-m68k/m68k-got.exp: Likewise. --- ld/ChangeLog | 6 +++++ ld/testsuite/ld-elf/sec64k.exp | 2 +- ld/testsuite/ld-m68k/m68k-got.exp | 52 +++++++++++++++++++-------------------- 3 files changed, 33 insertions(+), 27 deletions(-) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index 3fc4606..fa35cbf 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2019-01-08 Alan Modra + + * testsuite/ld-elf/sec64k.exp: Use . rather than $objdir in + generated source file names. + * testsuite/ld-m68k/m68k-got.exp: Likewise. + 2019-01-01 Alan Modra Update year range in copyright notice of all files. diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp index 07483ea..783d9ee 100644 --- a/ld/testsuite/ld-elf/sec64k.exp +++ b/ld/testsuite/ld-elf/sec64k.exp @@ -61,7 +61,7 @@ set sfiles {} set max_sec 66000 set secs_per_file 1000 for { set i 0 } { $i < $max_sec / $secs_per_file } { incr i } { - set sfile "$objdir/tmpdir/sec64-$i.s" + set sfile "./tmpdir/sec64-$i.s" lappend sfiles $sfile if [catch { set ofd [open $sfile w] } x] { perror "$x" diff --git a/ld/testsuite/ld-m68k/m68k-got.exp b/ld/testsuite/ld-m68k/m68k-got.exp index f2205d6..bbe0397 100644 --- a/ld/testsuite/ld-m68k/m68k-got.exp +++ b/ld/testsuite/ld-m68k/m68k-got.exp @@ -155,62 +155,62 @@ proc got_test { testname } { switch -- $testname { "got-single-12-ok" { - puts $ofd "#source: $objdir/tmpdir/got-12.s" + puts $ofd "#source: ./tmpdir/got-12.s" set count 8189 } "got-single-13-er" { - puts $ofd "#source: $objdir/tmpdir/got-13.s" + puts $ofd "#source: ./tmpdir/got-13.s" set count 0 } "got-negative-14-ok" { - puts $ofd "#source: $objdir/tmpdir/got-14.s" + puts $ofd "#source: ./tmpdir/got-14.s" set count 16382 } "got-negative-15-er" { - puts $ofd "#source: $objdir/tmpdir/got-15.s" + puts $ofd "#source: ./tmpdir/got-15.s" set count 0 } "got-negative-12-13-14-34-ok" { - puts $ofd "#source: $objdir/tmpdir/got-12.s" - puts $ofd "#source: $objdir/tmpdir/got-13.s" - puts $ofd "#source: $objdir/tmpdir/got-14.s" - puts $ofd "#source: $objdir/tmpdir/got-34.s" + puts $ofd "#source: ./tmpdir/got-12.s" + puts $ofd "#source: ./tmpdir/got-13.s" + puts $ofd "#source: ./tmpdir/got-14.s" + puts $ofd "#source: ./tmpdir/got-34.s" set count 16382 } "got-negative-12-13-14-35-er" { - puts $ofd "#source: $objdir/tmpdir/got-12.s" - puts $ofd "#source: $objdir/tmpdir/got-13.s" - puts $ofd "#source: $objdir/tmpdir/got-14.s" - puts $ofd "#source: $objdir/tmpdir/got-35.s" + puts $ofd "#source: ./tmpdir/got-12.s" + puts $ofd "#source: ./tmpdir/got-13.s" + puts $ofd "#source: ./tmpdir/got-14.s" + puts $ofd "#source: ./tmpdir/got-35.s" set count 0 } "got-multigot-14-ok" { - puts $ofd "#source: $objdir/tmpdir/got-14.s" + puts $ofd "#source: ./tmpdir/got-14.s" set count 16382 } "got-multigot-15-er" { - puts $ofd "#source: $objdir/tmpdir/got-15.s" + puts $ofd "#source: ./tmpdir/got-15.s" set count 0 } "got-multigot-12-13-14-34-35-ok" { - puts $ofd "#source: $objdir/tmpdir/got-12.s" - puts $ofd "#source: $objdir/tmpdir/got-13.s" - puts $ofd "#source: $objdir/tmpdir/got-14.s" - puts $ofd "#source: $objdir/tmpdir/got-34.s" - puts $ofd "#source: $objdir/tmpdir/got-35.s" + puts $ofd "#source: ./tmpdir/got-12.s" + puts $ofd "#source: ./tmpdir/got-13.s" + puts $ofd "#source: ./tmpdir/got-14.s" + puts $ofd "#source: ./tmpdir/got-34.s" + puts $ofd "#source: ./tmpdir/got-35.s" set count 24578 } "got-xgot-15-ok" { - puts $ofd "#source: $objdir/tmpdir/xgot-15.s" + puts $ofd "#source: ./tmpdir/xgot-15.s" set count 16385 } "got-xgot-12-13-14-15-34-35-ok" { - puts $ofd "#source: $objdir/tmpdir/got-12.s" - puts $ofd "#source: $objdir/tmpdir/got-13.s" - puts $ofd "#source: $objdir/tmpdir/got-14.s" - puts $ofd "#source: $objdir/tmpdir/xgot-15.s" - puts $ofd "#source: $objdir/tmpdir/got-34.s" - puts $ofd "#source: $objdir/tmpdir/got-35.s" + puts $ofd "#source: ./tmpdir/got-12.s" + puts $ofd "#source: ./tmpdir/got-13.s" + puts $ofd "#source: ./tmpdir/got-14.s" + puts $ofd "#source: ./tmpdir/xgot-15.s" + puts $ofd "#source: ./tmpdir/got-34.s" + puts $ofd "#source: ./tmpdir/got-35.s" set count 24581 } } -- cgit v1.1