Tighten regexp pattern used for validating output of config.guess

2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f149452..8d2a2a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-05-04  Jacob Bachmeyer  <jcb@gnu.org>
+
+	PR41855
+
+	* runtest.exp: Tighten regexp used to validate output from
+	config.guess.  The previous regexp would accept an error produced
+	if config.guess was incorrectly run using the C shell.
+
 2021-04-28  Jacob Bachmeyer  <jcb@gnu.org>
 
 	* configure, Makefile.in: Regenerate.
diff --git a/runtest.exp b/runtest.exp
index d950171..0e077ae 100644
--- a/runtest.exp
+++ b/runtest.exp
@@ -862,7 +862,7 @@ if {[expr {$build_triplet eq "" && $host_triplet eq ""}]} {
 	    }
 	}
     }
-    if { ![regexp -- {^[^-]+-[^-]+-[^-]+} $build_triplet] } {
+    if { ![regexp -- {^[[:alnum:]_.]+(-[[:alnum:]_.]+)+$} $build_triplet] } {
 	send_error "ERROR: Running config.guess produced bogus build triplet:\n"
 	send_error "        $build_triplet\n"
 	send_error "       (Perhaps you need to set CONFIG_SHELL or\