mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
dd53c7ab29
commit
eb3c430a85
|
@ -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()
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue