aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--runtest.exp2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f3a31d..d924a48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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"