test.patch revision 5718
5718N/AA couple of tests need patching:
5718N/A
5718N/A - There's a garbled sed command in the clone tests, which works for GNU
5718N/A sed, but not for Solaris.
5718N/A
5718N/A - Because we're doing the build in a symlink farm, one of the diff tests
5718N/A thinks that we're changing the type of the files from symlink to file,
5718N/A so the diffs come out wrong. Rather than cleverly mucking around with
5718N/A the working directory vs the repo directory, we just cat the files as
5718N/A real files into place.
5718N/A
5718N/AThe first patch is probably fine for upstream; the latter perhaps less so.
5718N/A
5718N/A--- git-2.4.5/t/t5601-clone.sh Thu Jun 25 12:15:40 2015
5718N/A+++ git-2.4.5/t/t5601-clone.sh Thu Jul 2 12:35:08 2015
5718N/A@@ -445,7 +445,7 @@
5718N/A #IPv6
5718N/A for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]:
5718N/A do
5718N/A- ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]")
5718N/A+ ehost=$(echo $tuah | sed -e "s/1]:/1]/" | tr -d "[]")
5718N/A test_expect_success "clone ssh://$tuah/home/user/repo" "
5718N/A test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
5718N/A "
5718N/A--- git-2.4.5/t/t4018-diff-funcname.sh Thu Jun 25 12:15:40 2015
5718N/A+++ git-2.4.5/t/t4018-diff-funcname.sh Thu Jul 2 14:11:09 2015
5718N/A@@ -79,8 +79,11 @@
5718N/A
5718N/A # add all test files to the index
5718N/A (
5718N/A- cd "$TEST_DIRECTORY"/t4018 &&
5718N/A- git --git-dir="$TRASH_DIRECTORY/.git" add .
5718N/A+ ( cd "$TEST_DIRECTORY"/t4018 && printf "%s\n" * ) | while read f
5718N/A+ do
5718N/A+ cat "$TEST_DIRECTORY"/t4018/$f > $f
5718N/A+ git add -v $f
5718N/A+ done
5718N/A ) &&
5718N/A
5718N/A # place modified files in the worktree
5718N/A
5718N/A
5718N/AThis simply adds a couple of targets to the test Makefile which allow us to
5718N/Arun the tests in parallel cleanly. This way the results don't get cleaned
5718N/Aup automatically after running the tests, and we can emit those results to
5718N/Athe master file. This might be interesting to upstream, but is really
5718N/Aspecific to running the tests in an external framework.
5718N/A
5718N/A--- git-2.7.4/t/Makefile Thu Mar 17 13:47:59 2016
5718N/A+++ git-2.7.4/t/Makefile Tue Mar 22 14:28:40 2016
5718N/A@@ -36,6 +36,9 @@
5718N/A test: pre-clean $(TEST_LINT)
5718N/A $(MAKE) aggregate-results-and-cleanup
5718N/A
5718N/A+test-noclean: pre-clean $(TEST_LINT)
5718N/A+ $(MAKE) T
5718N/A+
5718N/A prove: pre-clean $(TEST_LINT)
5718N/A @echo "*** prove ***"; $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
5718N/A $(MAKE) clean-except-prove-cache
5718N/A@@ -68,6 +71,8 @@
5718N/A test-lint-shell-syntax:
5718N/A @'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T) $(THELPERS)
5718N/A
5718N/A+T: $(T)
5718N/A+
5718N/A aggregate-results-and-cleanup: $(T)
5718N/A $(MAKE) aggregate-results
5718N/A $(MAKE) clean
5718N/A
5718N/A
5718N/AThis is a Solaris-specific patch that turns on GnuPG in the tests, which it
5718N/Awouldn't otherwise because we don't deliver GnuPG in its usual path.
5718N/A
5718N/A--- git-2.7.4/t/lib-gpg.sh Thu Mar 17 13:47:59 2016
5718N/A+++ git-2.7.4/t/lib-gpg.sh Tue Mar 22 14:40:59 2016
5718N/A@@ -1,5 +1,9 @@
5718N/A #!/bin/sh
5718N/A
5718N/A+gpg() {
5718N/A+ gpg2 "$@"
5718N/A+}
5718N/A+
5718N/A gpg_version=$(gpg --version 2>&1)
5718N/A if test $? = 127; then
5718N/A say "You do not seem to have gpg installed"
5718N/A
5718N/A
5718N/AThis allows Apache 2.4 to load on Solaris.
5718N/A
5718N/A--- git-2.7.4/t/lib-httpd/apache.conf Thu Mar 17 13:47:59 2016
5718N/A+++ git-2.7.4/t/lib-httpd/apache.conf Tue Mar 22 15:15:56 2016
5718N/A@@ -64,6 +64,9 @@
5718N/A <IfModule !mod_mpm_prefork.c>
5718N/A LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
5718N/A </IfModule>
5718N/A+<IfModule !mod_unixd.c>
5718N/A+ LoadModule unixd_module modules/mod_unixd.so
5718N/A+</IfModule>
5718N/A </IfVersion>
5718N/A
5718N/A PassEnv GIT_VALGRIND