Skip to content

Commit

Permalink
Adjust conditional for broken legacy case
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Jacob Bachmeyer committed Jul 10, 2021
1 parent be4c9af commit cd94f06
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
2021-06-29 Jacob Bachmeyer <[email protected]>

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 <[email protected]>

* Makefile.am (TESTSUITE_FILES): Correct oversight.
Expand Down
2 changes: 1 addition & 1 deletion runtest.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit cd94f06

Please sign in to comment.