{"thread":{"id":"2940","subject":"[PATCH] fix skipping merge-order test with NO_OPENSSL=1.","startedAt":"2005-12-28T11:25:38Z","lastAt":"2005-12-28T11:25:38Z","messageCount":1,"participants":["Gerrit Pape"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"14085","messageId":"20051228112538.20197.qmail@0e359e924d9d3e.315fe32.mid.smarden.org","threadId":"2940","inReplyTo":null,"subject":"[PATCH] fix skipping merge-order test with NO_OPENSSL=1.","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2005-12-28T11:25:38Z","receivedAt":"2005-12-28T11:25:38Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"Hi, when building git with NO_OPENSSL=1, the rev-list-merge-order\nselftests fail.  Moving the check for 'OpenSSL not linked' in the usage\noutput to after test no 1 and fixing the syntax works for me.\n\nRegards, Gerrit.\n\n\n* move git-rev-list --merge-order usage check for 'OpenSSL not linked' after\n  test 1.\n\nSigned-off-by: Gerrit Pape <pape@smarden.org>\n\n---\n\n t/t6001-rev-list-merge-order.sh |   14 +++++++-------\n 1 files changed, 7 insertions(+), 7 deletions(-)\n\n635cc4875b6bd8b6afb80742c7927ef4233ec562\ndiff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh\nindex 8ec9ebb..2f3c6f8 100755\n--- a/t/t6001-rev-list-merge-order.sh\n+++ b/t/t6001-rev-list-merge-order.sh\n@@ -8,13 +8,6 @@ test_description='Tests git-rev-list --m\n . ./test-lib.sh\n . ../t6000lib.sh # t6xxx specific functions\n \n-if git-rev-list --merge-order 2>&1 | grep 'OpenSSL not linked' >/dev/null\n-then\n-    test_expect_success 'skipping merge-order test' :\n-    test_done\n-    exit\n-fi    \n-\n # test-case specific test function\n check_adjacency()\n {\n@@ -114,6 +107,13 @@ test_expect_success 'rev-list has correc\n 19\n EOF\n \n+if git-rev-list --merge-order HEAD 2>&1 | grep 'OpenSSL not linked' >/dev/null\n+then\n+    test_expect_success 'skipping merge-order test' :\n+    test_done\n+    exit\n+fi\n+\n normal_adjacency_count=$(git-rev-list HEAD | check_adjacency | grep -c \"\\^\" | tr -d ' ')\n merge_order_adjacency_count=$(git-rev-list --merge-order HEAD | check_adjacency | grep -c \"\\^\" | tr -d ' ')\n test_expect_success '--merge-order produces as many or fewer discontinuities' '[ $merge_order_adjacency_count -le $normal_adjacency_count ]'\n-- \n1.0.3\n"}]}