changeset 19230:86e56edb9185

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.
author Bruno Haible <bruno@clisp.org>
date Sat, 07 Oct 2017 11:52:45 +0200
parents fa82f4549aa1
children 25119c2dfd7b
files ChangeLog tests/init.sh
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Oct 06 22:06:55 2017 +0900
+++ b/ChangeLog	Sat Oct 07 11:52:45 2017 +0200
@@ -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
--- a/tests/init.sh	Fri Oct 06 22:06:55 2017 +0900
+++ b/tests/init.sh	Sat Oct 07 11:52:45 2017 +0200
@@ -250,7 +250,7 @@
 # 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