From eb3c430a85306d08ad5f1cb3d29f990041bc2457 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 29 Jul 2005 15:32:43 -0700 Subject: [PATCH] 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 --- t/t6001-rev-list-merge-order.sh | 7 +++++++ 1 file changed, 7 insertions(+) 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() { -- 2.26.2