From cd94f0675dbf6f3d5cbc7945297a3cea57848249 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Fri, 9 Jul 2021 21:51:06 -0500 Subject: 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. --- runtest.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtest.exp') 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" -- cgit v1.1