From: Bruno Haible Date: Sat, 7 Oct 2017 09:52:45 +0000 (+0200) Subject: test-framework-sh: Don't require bash on Windows and OS/2. X-Git-Tag: v1.0~5882 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=235d203a0efa999ba53f79a0f450fc3f352793d9;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 470012f4b9..8d18287c7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-10-07 Bruno Haible + + 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 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