Browse Source

[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>
maint
Peter Eriksen 20 years ago committed by Junio C Hamano
parent
commit
edde7a8b53
  1. 2
      Makefile
  2. 3
      t/Makefile
  3. 2
      t/t0000-basic.sh

2
Makefile

@ -253,7 +253,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
gitk gitk


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


all: $(PROGRAMS) $(SCRIPTS) all: $(PROGRAMS) $(SCRIPTS)

3
t/Makefile

@ -4,11 +4,12 @@
# #


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


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


all: 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 @rm -fr trash


clean: clean:

2
t/t0000-basic.sh

@ -85,7 +85,7 @@ do
done done
test_expect_success \ test_expect_success \
'adding various types of objects with git-update-index --add.' \ '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. # Show them and see that matches what we expect.
test_expect_success \ test_expect_success \

Loading…
Cancel
Save