Skip to content

Commit

Permalink
[PATCH] Make the test more shell generic and fix missing Solaris find…
Browse files Browse the repository at this point in the history
… option

This is from Peter Eriksen, but further fixed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Peter Eriksen authored and Junio C Hamano committed Sep 27, 2005
1 parent 3cc35e2 commit edde7a8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
gitk

export TAR INSTALL DESTDIR
export TAR INSTALL DESTDIR SHELL_PATH
### Build rules

all: $(PROGRAMS) $(SCRIPTS)
Expand Down
3 changes: 2 additions & 1 deletion t/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
#

#GIT_TEST_OPTS=--verbose --debug
SHELL_PATH ?= $(SHELL)

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

all:
@$(foreach t,$T,echo "*** $t ***"; sh $t $(GIT_TEST_OPTS) || exit; )
@$(foreach t,$T,echo "*** $t ***"; $(SHELL_PATH) $t $(GIT_TEST_OPTS) || exit; )
@rm -fr trash

clean:
Expand Down
2 changes: 1 addition & 1 deletion t/t0000-basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ do
done
test_expect_success \
'adding various types of objects with git-update-index --add.' \
'find path* ! -type d -print0 | xargs -0 git-update-index --add'
'find path* ! -type d -print | xargs git-update-index --add'

# Show them and see that matches what we expect.
test_expect_success \
Expand Down

0 comments on commit edde7a8

Please sign in to comment.