diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/sec64k.exp | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-m68k/m68k-got.exp | 52 |
3 files changed, 33 insertions, 27 deletions
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 <amodra@gmail.com> + + * 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 <amodra@gmail.com> 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 } } |