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

Michael J Gruber · gitster · commit 49383dd431b5 · 2015-03-20T12:37:05.000-07:00
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 &lt;git@drmicha.warpmail.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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' '
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk)
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
 	test "$mergeinfo" = "/branches/foo:1-10"
 '
 
@@ -46,7 +46,7 @@ test_expect_success 'change 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"
 '
diff --git 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' '
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
 	test "$mergeinfo" = "/branches/svnb2:3,8"
 	'
 
@@ -34,7 +34,7 @@ test_expect_success 'merge another branch' '
 	'
 
 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"
 	'
@@ -45,7 +45,7 @@ test_expect_success 'merge existing merge' '
 	'
 
 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
@@ -70,7 +70,7 @@ test_expect_success 'second forward merge' '
 	'
 
 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
@@ -84,7 +84,7 @@ test_expect_success 'reintegration merge' '
 	'
 
 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

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ test_expect_success 'change svn:mergeinfo' '`
`34`	`34`	`'`
`35`	`35`
`36`	`36`	`test_expect_success 'verify svn:mergeinfo' '`
`37`		`- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk)`
	`37`	`+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&`
`38`	`38`	`test "$mergeinfo" = "/branches/foo:1-10"`
`39`	`39`	`'`
`40`	`40`
`@@ -46,7 +46,7 @@ test_expect_success 'change svn:mergeinfo multiline' '`
`46`	`46`	`'`
`47`	`47`
`48`	`48`	`test_expect_success 'verify svn:mergeinfo multiline' '`
`49`		`- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk)`
	`49`	`+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&`
`50`	`50`	`test "$mergeinfo" = "/branches/bar:1-10`
`51`	`51`	`/branches/other:3-5,8,10-11"`
`52`	`52`	`'`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ test_expect_success 'propagate merge information' '`
`24`	`24`	`'`
`25`	`25`
`26`	`26`	`test_expect_success 'check svn:mergeinfo' '`
`27`		`- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)`
	`27`	`+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&`
`28`	`28`	`test "$mergeinfo" = "/branches/svnb2:3,8"`
`29`	`29`	`'`
`30`	`30`
`@@ -34,7 +34,7 @@ test_expect_success 'merge another branch' '`
`34`	`34`	`'`
`35`	`35`
`36`	`36`	`test_expect_success 'check primary parent mergeinfo respected' '`
`37`		`- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)`
	`37`	`+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&`
`38`	`38`	`test "$mergeinfo" = "/branches/svnb2:3,8`
`39`	`39`	`/branches/svnb3:4,9"`
`40`	`40`	`'`
`@@ -45,7 +45,7 @@ test_expect_success 'merge existing merge' '`
`45`	`45`	`'`
`46`	`46`
`47`	`47`	`test_expect_success "check both parents' mergeinfo respected" '`
`48`		`- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)`
	`48`	`+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&`
`49`	`49`	`test "$mergeinfo" = "/branches/svnb2:3,8`
`50`	`50`	`/branches/svnb3:4,9`
`51`	`51`	`/branches/svnb4:5-6,10-12`
`@@ -70,7 +70,7 @@ test_expect_success 'second forward merge' '`
`70`	`70`	`'`
`71`	`71`
`72`	`72`	`test_expect_success 'check new mergeinfo added' '`
`73`		`- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)`
	`73`	`+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&`
`74`	`74`	`test "$mergeinfo" = "/branches/svnb2:3,8,16-17`
`75`	`75`	`/branches/svnb3:4,9`
`76`	`76`	`/branches/svnb4:5-6,10-12`
`@@ -84,7 +84,7 @@ test_expect_success 'reintegration merge' '`
`84`	`84`	`'`
`85`	`85`
`86`	`86`	`test_expect_success 'check reintegration mergeinfo' '`
`87`		`- mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)`
	`87`	`+ mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4) &&`
`88`	`88`	`test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18`
`89`	`89`	`/branches/svnb2:3,8,16-17`
`90`	`90`	`/branches/svnb3:4,9`