summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2005-12-28 11:25:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-28 19:09:53 (GMT)
commitf1ec72ba1e52783179a7da7defaab0458c895617 (patch)
tree05623adb92c7e54a96e92186d36a6aa21b9fdcdc
parent36cd2cc7d949e1cc39104307fe904c47fe6d5526 (diff)
downloadgit-f1ec72ba1e52783179a7da7defaab0458c895617.zip
git-f1ec72ba1e52783179a7da7defaab0458c895617.tar.gz
git-f1ec72ba1e52783179a7da7defaab0458c895617.tar.bz2
Fix skipping merge-order test with NO_OPENSSL=1.
Move git-rev-list --merge-order usage check for 'OpenSSL not linked' after test 1; we cannot trigger this unless we try to actually use --merge-order by giving some ref, and we do not have any ref until we run the first test to create commits. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xt/t6001-rev-list-merge-order.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index 368b8d9..7724e8a 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 --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()
{
@@ -114,6 +107,13 @@ test_output_expect_success 'rev-list has correct number of entries' 'git-rev-lis
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 ]'