From: Mike Hommey <mh@glandium.org>
Date: Mon, 7 Jul 2008 19:02:50 +0000 (+0200)
Subject: Skip t5540-http-push test when USE_CURL_MULTI is undefined
X-Git-Tag: v1.6.0-rc0~105
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=960862628256ca3272939db7973b030c2b6ba548;p=git.git

Skip t5540-http-push test when USE_CURL_MULTI is undefined

When USE_CURL_MULTI is undefined, git http-push doesn't work, so it's
useless to test it.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index ee63945c9..21dbb557b 100755
--- a/t/t5540-http-push.sh
+++ b/t/t5540-http-push.sh
@@ -12,6 +12,13 @@ This test runs various sanity checks on http-push.'
 ROOT_PATH="$PWD"
 LIB_HTTPD_DAV=t
 
+if git http-push > /dev/null 2>&1 || [ $? -eq 128 ]
+then
+	say "skipping test, USE_CURL_MULTI is not defined"
+	test_done
+	exit
+fi
+
 . ../lib-httpd.sh
 
 if ! start_httpd >&3 2>&4