summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tests/init.sh2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 470012f4b9..8d18287c7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-07 Bruno Haible <bruno@clisp.org>
+
+ test-framework-sh: Don't require bash on Windows and OS/2.
+ Reported by KO Myung-Hun.
+ * tests/test-init.sh: Use 'shopt' only when running in bash.
+
2017-10-06 KO Myung-Hun <komh@chollian.net>
wcwidth: check a macro version of wcwidth () as well
diff --git a/tests/init.sh b/tests/init.sh
index 470605c116..0821c572ae 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -250,7 +250,7 @@ test -n "$BASH_VERSION" && unalias -a
# That is part of the shell-selection test above. Why use aliases rather
# than functions? Because support for hyphen-containing aliases is more
# widespread than that for hyphen-containing function names.
-test -n "$EXEEXT" && shopt -s expand_aliases
+test -n "$EXEEXT" && test -n "$BASH_VERSION" && shopt -s expand_aliases
# Enable glibc's malloc-perturbing option.
# This is useful for exposing code that depends on the fact that