Re: [PATCH 2/6] t5538: fix default http port

From: Jeff King <peff@peff.net>
Date: Feb 10, 2014, 19:16 UTC
Message-ID: <20140210191637.GA3820@sigill.intra.peff.net>
In-Reply-To: <20140210191521.GA3112@sigill.intra.peff.net>

On Mon, Feb 10, 2014 at 02:15:24PM -0500, Jeff King wrote:

> Thanks. It might be worth squashing in the patch below (or sticking it
> on top), to cover git-daemon as well.

Patch would probably be easier to read if I actually included it...

-- >8 --
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 <peff@peff.net>
---
 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 394b06b..1f22de2 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 e061468..6b16379 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

-- 
1.8.5.2.500.g8060133