t9158, t9161: fix broken &&-chain in git-svn tests

All of these cases are moderate since they would most probably not
lead to missed failing tests; either they would fail otherwise, or
fail a rm in test_when_finished only.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh
index 8c9539e1b47a817fff98bad1ed1a99e890386ec9..13f78f2682602014711714a09a8f675c3eed1ff0 100755 (executable)
--- a/t/t9158-git-svn-mergeinfo.sh
+++ b/t/t9158-git-svn-mergeinfo.sh
@@ -34,7 +34,7 @@ test_expect_success 'change svn:mergeinfo' '
 '
 
 test_expect_success 'verify svn:mergeinfo' '
 '
 
 test_expect_success 'verify svn:mergeinfo' '

-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk)
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&

        test "$mergeinfo" = "/branches/foo:1-10"
 '
 
        test "$mergeinfo" = "/branches/foo:1-10"
 '
 


@@ -46,7 +46,7 @@ test_expect_success 'change svn:mergeinfo multiline' '
 '
 
 test_expect_success 'verify svn:mergeinfo multiline' '
 '
 
 test_expect_success 'verify svn:mergeinfo multiline' '

-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk)
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&

        test "$mergeinfo" = "/branches/bar:1-10
 /branches/other:3-5,8,10-11"
 '
        test "$mergeinfo" = "/branches/bar:1-10
 /branches/other:3-5,8,10-11"
 '

diff --git a/t/t9161-git-svn-mergeinfo-push.sh b/t/t9161-git-svn-mergeinfo-push.sh
index 6cb0909afee7742965e4caa865fc68722512556c..f113acaa6c2e01cae94e5cc25a1adaa1242bc407 100755 (executable)
--- a/t/t9161-git-svn-mergeinfo-push.sh
+++ b/t/t9161-git-svn-mergeinfo-push.sh
@@ -24,7 +24,7 @@ test_expect_success 'propagate merge information' '
        '
 
 test_expect_success 'check svn:mergeinfo' '
        '
 
 test_expect_success 'check svn:mergeinfo' '

-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&

        test "$mergeinfo" = "/branches/svnb2:3,8"
        '
 
        test "$mergeinfo" = "/branches/svnb2:3,8"
        '
 


@@ -34,7 +34,7 @@ test_expect_success 'merge another branch' '
        '
 
 test_expect_success 'check primary parent mergeinfo respected' '
        '
 
 test_expect_success 'check primary parent mergeinfo respected' '

-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&

        test "$mergeinfo" = "/branches/svnb2:3,8
 /branches/svnb3:4,9"
        '
        test "$mergeinfo" = "/branches/svnb2:3,8
 /branches/svnb3:4,9"
        '


@@ -45,7 +45,7 @@ test_expect_success 'merge existing merge' '
        '
 
 test_expect_success "check both parents' mergeinfo respected" '
        '
 
 test_expect_success "check both parents' mergeinfo respected" '

-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&

        test "$mergeinfo" = "/branches/svnb2:3,8
 /branches/svnb3:4,9
 /branches/svnb4:5-6,10-12
        test "$mergeinfo" = "/branches/svnb2:3,8
 /branches/svnb3:4,9
 /branches/svnb4:5-6,10-12


@@ -70,7 +70,7 @@ test_expect_success 'second forward merge' '
        '
 
 test_expect_success 'check new mergeinfo added' '
        '
 
 test_expect_success 'check new mergeinfo added' '

-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&

        test "$mergeinfo" = "/branches/svnb2:3,8,16-17
 /branches/svnb3:4,9
 /branches/svnb4:5-6,10-12
        test "$mergeinfo" = "/branches/svnb2:3,8,16-17
 /branches/svnb3:4,9
 /branches/svnb4:5-6,10-12


@@ -84,7 +84,7 @@ test_expect_success 'reintegration merge' '
        '
 
 test_expect_success 'check reintegration mergeinfo' '
        '
 
 test_expect_success 'check reintegration mergeinfo' '

-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4) &&

        test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
 /branches/svnb2:3,8,16-17
 /branches/svnb3:4,9
        test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
 /branches/svnb2:3,8,16-17
 /branches/svnb3:4,9