aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-07-29 15:32:43 -0700
committerJunio C Hamano <junkio@cox.net>2005-07-29 17:21:53 -0700
commiteb3c430a85306d08ad5f1cb3d29f990041bc2457 (patch)
tree52549d883865e7071718373a337e9acb6d14967e /t
parentdd53c7ab297cc491eb5164198e63d670c7b48530 (diff)
downloadgit-eb3c430a85306d08ad5f1cb3d29f990041bc2457.tar.gz
git-eb3c430a85306d08ad5f1cb3d29f990041bc2457.tar.xz
Skip --merge-order test when built with NO_OPENSSL
When built with NO_OPENSSL, rev-list --merge-order does not work, causing t6001 test to fail. Detect that and skip this test to allow continuing to the rest of the tests. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t6001-rev-list-merge-order.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index 5dcb957ac..7fe744e83 100755
--- a/t/t6001-rev-list-merge-order.sh
+++ b/t/t6001-rev-list-merge-order.sh
@@ -8,6 +8,13 @@ test_description='Tests git-rev-list --merge-order functionality'
. ./test-lib.sh
. ../t6000lib.sh # t6xxx specific functions
+if git-rev-list --merge-order 2>&1 | grep 'OpenSSL not linked' >/dev/null
+then
+ test_expect_success 'skipping merge-order test' :
+ test_done
+ exit
+fi
+
# test-case specific test function
check_adjacency()
{