From c44132fcf383cf668d3764c6b7ad28ff034ee981 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 10 Feb 2014 14:16:38 -0500 Subject: [PATCH] tests: auto-set git-daemon port A recent commit taught lib-httpd to always start apache on the same port as the numbered tests. Let's do the same for the git-daemon tests. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/lib-git-daemon.sh | 2 +- t/t5570-git-daemon.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh index 394b06b32..1f22de260 100644 --- a/t/lib-git-daemon.sh +++ b/t/lib-git-daemon.sh @@ -22,7 +22,7 @@ then test_done fi -LIB_GIT_DAEMON_PORT=${LIB_GIT_DAEMON_PORT-'8121'} +LIB_GIT_DAEMON_PORT=${LIB_GIT_DAEMON_PORT-${this_test#t}} GIT_DAEMON_PID= GIT_DAEMON_DOCUMENT_ROOT_PATH="$PWD"/repo diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index e06146835..6b1637995 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -3,7 +3,6 @@ test_description='test fetching over git protocol' . ./test-lib.sh -LIB_GIT_DAEMON_PORT=${LIB_GIT_DAEMON_PORT-5570} . "$TEST_DIRECTORY"/lib-git-daemon.sh start_git_daemon -- 2.11.0