From: Clemens Buchacher Date: Thu, 29 Oct 2009 00:31:17 GMT Subject: Re: [RFC PATCH v4 26/26] test smart http fetch and push Message-ID: <20091029003117.GA18299@localhost> In-Reply-To: <1256774448-7625-27-git-send-email-spearce@spearce.org> On Wed, Oct 28, 2009 at 05:00:48PM -0700, Shawn O. Pearce wrote: > --- /dev/null > +++ b/t/t5541-http-push.sh [...] > +LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5550'} This should be 5541. We need different ports to be able to run the tests simultenously. > --- a/t/t5550-http-fetch.sh > +++ b/t/t5550-http-fetch.sh There is also a http port related bug in t5550. I'm attaching the patch below. Maybe you want to squash this in here. > --- /dev/null > +++ b/t/t5551-http-fetch.sh [...] > +LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5550'} Ditto, 5551. Clemens -->o-- Subject: [PATCH] set httpd port before sourcing lib-httpd If LIB_HTTPD_PORT is not set already, lib-httpd will set it to the default 8111. Signed-off-by: Clemens Buchacher --- t/t5540-http-push.sh | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh index 5c0f4d7..ea46d1e 100755 --- a/t/t5540-http-push.sh +++ b/t/t5540-http-push.sh @@ -9,17 +9,16 @@ This test runs various sanity checks on http-push.' . ./test-lib.sh -ROOT_PATH="$PWD" -LIB_HTTPD_DAV=t -LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5540'} - if git http-push > /dev/null 2>&1 || [ $? -eq 128 ] then say "skipping test, USE_CURL_MULTI is not defined" test_done fi +LIB_HTTPD_DAV=t +LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5540'} . "$TEST_DIRECTORY"/lib-httpd.sh +ROOT_PATH="$PWD" start_httpd test_expect_success 'setup remote repository' ' -- 1.6.5.1.208.gd7b37