aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--testsuite/runtest.main/pr48155.exp4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ad73d8..1544385 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-18 Jacob Bachmeyer <jcb@gnu.org>
+
+ * testsuite/runtest.main/pr48155.exp: Fix assumption about exit
+ code from /bin/false, which is different on Solaris.
+
2021-05-05 Jacob Bachmeyer <jcb@gnu.org>
PR48155
diff --git a/testsuite/runtest.main/pr48155.exp b/testsuite/runtest.main/pr48155.exp
index c477597..8b152cf 100644
--- a/testsuite/runtest.main/pr48155.exp
+++ b/testsuite/runtest.main/pr48155.exp
@@ -78,7 +78,7 @@ proc test_pr48155_error { name envlist output } {
test_pr48155_error "bogus CONFIG_SHELL as false" \
[list CONFIG_SHELL [which false]] \
- "exited on code 1.*produced bogus build triplet:"
+ "exited on code .*produced bogus build triplet:"
test_pr48155_error "bogus CONFIG_SHELL as true" \
[list CONFIG_SHELL [which true]] \
"produced bogus build triplet:"
@@ -91,7 +91,7 @@ test_pr48155_error "bogus CONFIG_SHELL as simulated C shell" \
test_pr48155_error "bogus SHELL as false" \
[list SHELL [which false]] \
- "exited on code 1.*produced bogus build triplet:"
+ "exited on code .*produced bogus build triplet:"
test_pr48155_error "bogus SHELL as true" \
[list SHELL [which true]] \
"produced bogus build triplet:"