summaryrefslogtreecommitdiff
path: root/t/lib-git-daemon.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-05 23:06:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-05 23:06:45 (GMT)
commitee3a81e69cde27add025e206cd9dd2937c80f230 (patch)
tree7d0d11091854293753e3bc7831f9bc77699212e1 /t/lib-git-daemon.sh
parent4c4ac4db2c933fbae1c6e6bcf90d9bee5f823fc7 (diff)
parent83d842dc8ce4380aa365485b4d9845762f80c6db (diff)
downloadgit-ee3a81e69cde27add025e206cd9dd2937c80f230.zip
git-ee3a81e69cde27add025e206cd9dd2937c80f230.tar.gz
git-ee3a81e69cde27add025e206cd9dd2937c80f230.tar.bz2
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.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
index 1f22de2..bc4b341 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
}