diff options
author | Jacob Bachmeyer <jcb62281+dev@gmail.com> | 2020-05-28 21:35:55 -0500 |
---|---|---|
committer | Jacob Bachmeyer <jcb62281+dev@gmail.com> | 2020-05-28 21:35:55 -0500 |
commit | d37c15b4d569a3d70493653efe82a78c3550e903 (patch) | |
tree | 2b4834b39df419ce74b352ac16d7978439b7dc1c | |
parent | 205b28531d6df621e624137ea1bf914225956cb8 (diff) | |
download | dejagnu-d37c15b4d569a3d70493653efe82a78c3550e903.zip dejagnu-d37c15b4d569a3d70493653efe82a78c3550e903.tar.gz dejagnu-d37c15b4d569a3d70493653efe82a78c3550e903.tar.bz2 |
Fix problems with relative srcdir in launcher and report-card testsuites
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | testsuite/lib/launcher.exp | 3 | ||||
-rw-r--r-- | testsuite/lib/report-card.exp | 3 |
3 files changed, 7 insertions, 2 deletions
@@ -1,6 +1,9 @@ 2020-05-28 Jacob Bachmeyer <jcb62281+dev@gmail.com> PR 41587 + * testsuite/lib/launcher.exp: Adjust LAUNCHER variable default + value to use an absolute file name. + * testsuite/lib/report-card.exp: Likewise. * testsuite/runtest.main/options.exp: Set outdir in options-init instead of changing working directory in child runtest. diff --git a/testsuite/lib/launcher.exp b/testsuite/lib/launcher.exp index 906f722..42dc144 100644 --- a/testsuite/lib/launcher.exp +++ b/testsuite/lib/launcher.exp @@ -20,7 +20,8 @@ if { ![info exists LAUNCHER] } { set LAUNCHER \ - [file join [file dirname [testsuite file -source -top]] dejagnu] + [file normalize \ + [file join [file dirname [testsuite file -source -top]] dejagnu]] } verbose "Using LAUNCHER $LAUNCHER" 2 diff --git a/testsuite/lib/report-card.exp b/testsuite/lib/report-card.exp index 7fa8838..b071082 100644 --- a/testsuite/lib/report-card.exp +++ b/testsuite/lib/report-card.exp @@ -21,7 +21,8 @@ # Ensure that the dejagnu(1) launcher is available for testing. if { ![info exists LAUNCHER] } { set LAUNCHER \ - [file join [file dirname [testsuite file -source -top]] dejagnu] + [file normalize \ + [file join [file dirname [testsuite file -source -top]] dejagnu]] } verbose "Using LAUNCHER $LAUNCHER" 2 |