Skip to content

Commit edde7a8

Browse files
Peter EriksenJunio C Hamano
Peter Eriksen
authored and
Junio C Hamano
committed
[PATCH] Make the test more shell generic and fix missing Solaris find option
This is from Peter Eriksen, but further fixed. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 3cc35e2 commit edde7a8

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
253253
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
254254
gitk
255255

256-
export TAR INSTALL DESTDIR
256+
export TAR INSTALL DESTDIR SHELL_PATH
257257
### Build rules
258258

259259
all: $(PROGRAMS) $(SCRIPTS)

‎t/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
#
55

66
#GIT_TEST_OPTS=--verbose --debug
7+
SHELL_PATH ?= $(SHELL)
78

89
T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
910

1011
all:
11-
@$(foreach t,$T,echo "*** $t ***"; sh $t $(GIT_TEST_OPTS) || exit; )
12+
@$(foreach t,$T,echo "*** $t ***"; $(SHELL_PATH) $t $(GIT_TEST_OPTS) || exit; )
1213
@rm -fr trash
1314

1415
clean:

‎t/t0000-basic.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ do
8585
done
8686
test_expect_success \
8787
'adding various types of objects with git-update-index --add.' \
88-
'find path* ! -type d -print0 | xargs -0 git-update-index --add'
88+
'find path* ! -type d -print | xargs git-update-index --add'
8989

9090
# Show them and see that matches what we expect.
9191
test_expect_success \

0 commit comments

Comments
 (0)