From cd94f0675dbf6f3d5cbc7945297a3cea57848249 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Fri, 9 Jul 2021 21:51:06 -0500 Subject: [PATCH] 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. --- ChangeLog | 9 +++++++++ runtest.exp | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3f3a31d3..d924a48f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2021-06-29 Jacob Bachmeyer + + 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 * Makefile.am (TESTSUITE_FILES): Correct oversight. diff --git a/runtest.exp b/runtest.exp index f513222e..4e4eb153 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"