Skip to content

Commit b34709a

Browse files
committed
Meta/Make: also support ksh
1 parent 45c2780 commit b34709a

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

Make

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ do
5555
)
5656
done
5757

58-
tests= jobs= oldtest= with_dash= testpen=
58+
tests= jobs= oldtest= with_shell= testpen=
5959
clean=:
6060

6161
determine_branch () {
@@ -140,8 +140,14 @@ do
140140
GIT_TEST_LONG=YesPlease
141141
export GIT_TEST_LONG
142142
;;
143+
--bash)
144+
with_shell=/bin/bash
145+
;;
143146
--dash)
144-
with_dash=y
147+
with_shell=/bin/dash
148+
;;
149+
--ksh)
150+
with_shell=/bin/ksh
145151
;;
146152
--)
147153
shift
@@ -176,8 +182,6 @@ then
176182
export GIT_TEST_OPTS
177183
fi
178184

179-
test -f /bin/dash || with_dash=
180-
181185
if test -z "$oldtest" &&
182186
sh -c 'prove --version >/dev/null 2>&1' &&
183187
sh -c 'prove --exec : >/dev/null 2>&1'
@@ -209,9 +213,9 @@ clean="$clean; rm -f version"
209213
determine_long_version >version
210214

211215
set "prefix=$prefix" "$@"
212-
if test -n "$with_dash" && test -f /bin/dash
216+
if test -n "$with_shell" && test -f "$with_shell"
213217
then
214-
set "SHELL_PATH=/bin/dash" "$@"
218+
set "SHELL_PATH=$with_shell" "$@"
215219
fi
216220

217221
if grep >/dev/null DC_SHA1 Makefile

0 commit comments

Comments
 (0)