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>
Gerrit Pape committed
Dec 28, 2005 at 12:25 UTC
f1ec72ba1e52783179a7da7defaab0458c895617
1 file changed
+7
-7
t/t6001-rev-list-merge-order.sh
+7
-7
@@ -8,13 +8,6 @@ test_description='Tests git-rev-list --merge-order functionality'
8
. ./test-lib.sh
9
. ../t6000lib.sh # t6xxx specific functions
10
11
-if git-rev-list --merge-order 2>&1 | grep 'OpenSSL not linked' >/dev/null
12
-then
13
- test_expect_success 'skipping merge-order test' :
14
- test_done
15
- exit
16
-fi
17
-
11
# test-case specific test function
12
check_adjacency()
13
{
@@ -114,6 +107,13 @@ test_output_expect_success 'rev-list has correct number of entries' 'git-rev-lis
107
19
108
EOF
109
110
+if git-rev-list --merge-order HEAD 2>&1 | grep 'OpenSSL not linked' >/dev/null
111
+then
112
+ test_expect_success 'skipping merge-order test' :
113
+ test_done
114
+ exit
115
+fi
116
+
117
normal_adjacency_count=$(git-rev-list HEAD | check_adjacency | grep -c "\^" | tr -d ' ')
118
merge_order_adjacency_count=$(git-rev-list --merge-order HEAD | check_adjacency | grep -c "\^" | tr -d ' ')
119
test_expect_success '--merge-order produces as many or fewer discontinuities' '[ $merge_order_adjacency_count -le $normal_adjacency_count ]'