mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/run-network-tests-by-default'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2014-03-05 15:06:42 -08:00
parent 4c4ac4db2c 83d842dc8c
commit ee3a81e69c
3 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/lib-git-daemon.sh
View File

@ -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
}