[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>

diff --git a/Makefile b/Makefile
index afd4b14c41dfdc26e52ce09f39534bbae30a9f36..9920467d9060a434e96a38136bf3caf56c19ca8d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -253,7 +253,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
          $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
          gitk
 
          $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
          gitk
 

-export TAR INSTALL DESTDIR
+export TAR INSTALL DESTDIR SHELL_PATH

 ### Build rules
 
 all: $(PROGRAMS) $(SCRIPTS)
 ### Build rules
 
 all: $(PROGRAMS) $(SCRIPTS)

diff --git a/t/Makefile b/t/Makefile
index 6882e23be568ccf14f3adb0c766139086f2ee952..a6b80882cee795f76df907bfb52b90b81b2d1524 100644 (file)
--- a/t/Makefile
+++ b/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)
 
 all:
 
 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:
        @rm -fr trash
 
 clean:

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 3649f0f74570ac9d7a65287604663cb52567a6f0..bd940bd09b3df6ff6cecae4fa8a9db739ef000e4 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -85,7 +85,7 @@ do
 done
 test_expect_success \
     'adding various types of objects with git-update-index --add.' \
 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 \
 
 # Show them and see that matches what we expect.
 test_expect_success \