Gerrit PapeHi, when building git with NO_OPENSSL=1, the rev-list-merge-order selftests fail. Moving the check for 'OpenSSL not linked' in the usage output to after test no 1 and fixing the syntax works for me.
Regards, Gerrit.
* move git-rev-list --merge-order usage check for 'OpenSSL not linked' after test 1.
Signed-off-by: Gerrit Pape <pape@smarden.org>
---
t/t6001-rev-list-merge-order.sh | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
635cc4875b6bd8b6afb80742c7927ef4233ec562
Show changes to t/t6001-rev-list-merge-order.sh +7 −7
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh index 8ec9ebb..2f3c6f8 100755 --- a/t/t6001-rev-list-merge-order.sh +++ b/t/t6001-rev-list-merge-order.sh @@ -8,13 +8,6 @@ test_description='Tests git-rev-list --m . ./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() { @@ -114,6 +107,13 @@ test_expect_success 'rev-list has correc 19 EOF +if git-rev-list --merge-order HEAD 2>&1 | grep 'OpenSSL not linked' >/dev/null +then + test_expect_success 'skipping merge-order test' : + test_done + exit +fi + normal_adjacency_count=$(git-rev-list HEAD | check_adjacency | grep -c "\^" | tr -d ' ') merge_order_adjacency_count=$(git-rev-list --merge-order HEAD | check_adjacency | grep -c "\^" | tr -d ' ') test_expect_success '--merge-order produces as many or fewer discontinuities' '[ $merge_order_adjacency_count -le $normal_adjacency_count ]'
-- 1.0.3