diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-06 00:06:42 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-06 00:06:45 +0100 |
| commit | ee3a81e69cde27add025e206cd9dd2937c80f230 (patch) | |
| tree | 7d0d11091854293753e3bc7831f9bc77699212e1 /t/lib-git-daemon.sh | |
| parent | Merge branch 'nd/daemonize-gc' (diff) | |
| parent | tests: turn on network daemon tests by default (diff) | |
| download | git-ee3a81e69cde27add025e206cd9dd2937c80f230.tar.xz git-ee3a81e69cde27add025e206cd9dd2937c80f230.zip | |
Merge branch 'jk/run-network-tests-by-default'
Teach "make test" to run networking tests when possible by default.
* jk/run-network-tests-by-default:
tests: turn on network daemon tests by default
Diffstat (limited to 't/lib-git-daemon.sh')
| -rw-r--r-- | t/lib-git-daemon.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh index 1f22de260a..bc4b3412fb 100644 --- a/t/lib-git-daemon.sh +++ b/t/lib-git-daemon.sh @@ -16,9 +16,10 @@ # stop_git_daemon # test_done -if test -z "$GIT_TEST_GIT_DAEMON" +test_tristate GIT_TEST_GIT_DAEMON +if test "$GIT_TEST_GIT_DAEMON" = false then - skip_all="git-daemon testing disabled (define GIT_TEST_GIT_DAEMON to enable)" + skip_all="git-daemon testing disabled (unset GIT_TEST_GIT_DAEMON to enable)" test_done fi @@ -58,7 +59,8 @@ start_git_daemon() { kill "$GIT_DAEMON_PID" wait "$GIT_DAEMON_PID" trap 'die' EXIT - error "git daemon failed to start" + test_skip_or_die $GIT_TEST_GIT_DAEMON \ + "git daemon failed to start" fi } |