diff options
author | Jacob Bachmeyer <jcb@gnu.org> | 2021-07-09 21:51:06 -0500 |
---|---|---|
committer | Jacob Bachmeyer <jcb@gnu.org> | 2021-07-09 21:51:06 -0500 |
commit | cd94f0675dbf6f3d5cbc7945297a3cea57848249 (patch) | |
tree | daf562f748715260370bdf3cd0d099e855bb5df3 | |
parent | be4c9afb6075676822cd5d921281347876e85509 (diff) | |
download | dejagnu-cd94f0675dbf6f3d5cbc7945297a3cea57848249.zip dejagnu-cd94f0675dbf6f3d5cbc7945297a3cea57848249.tar.gz dejagnu-cd94f0675dbf6f3d5cbc7945297a3cea57848249.tar.bz2 |
Adjust conditional for broken legacy case
DejaGnu has always required testsuites to be rooted in a directory
named exactly "testsuite" but older versions happened to work even
if this requirement was violated. Special handling for this broken
case was included, but the conditional to invoke this handling was
too narrow and missed several cases in the GNU Automake testsuite.
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | runtest.exp | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2021-06-29 Jacob Bachmeyer <jcb@gnu.org> + + PR49250 + + * runtest.exp: Adjust detection logic for deprecated broken legacy + case of a testsuite not actually in a testsuite/ directory. + + This was never supported but happened to work in older versions. + 2021-05-22 Jacob Bachmeyer <jcb@gnu.org> * Makefile.am (TESTSUITE_FILES): Correct oversight. diff --git a/runtest.exp b/runtest.exp index f513222..4e4eb15 100644 --- a/runtest.exp +++ b/runtest.exp @@ -741,7 +741,7 @@ if { [file tail $srcdir] eq "testsuite" } { set testsuitedir $base_dir set testbuilddir $base_dir } else { - if { $testsuitedir eq "testsuite" && $srcdir eq "." && $objdir eq "." } { + if { $testsuitedir eq "testsuite" && $testbuilddir eq "testsuite" } { # Broken legacy case -- testsuite not actually in testsuite/ # Produce a warning, but continue. send_error "WARNING: testsuite is not in a testsuite/ directory.\n" |