rev-list simplify tests: don't ignore "git" exit code

avar · gitster · commit a6ecc256c34c · 2022-03-07T13:27:41.000-08:00
Change a fragile test pattern introduced in 6534703 (Topo-sort before --simplify-merges, 2008-08-03) to check the exit code of both "git name-rev" and "git log". This test as a whole would fail under SANITIZE=leak, but we'd pass several "failing" tests due to hiding these exit codes before we'd spot git dying with abort(). Now we'll instead spot all of the failures. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
@@ -12,7 +12,9 @@ note () {
 }
 
 unnote () {
-	git name-rev --tags --annotate-stdin | sed -e "s|$OID_REGEX (tags/\([^)]*\)) |\1 |g"
+	test_when_finished "rm -f tmp" &&
+	git name-rev --tags --annotate-stdin >tmp &&
+	sed -e "s|$OID_REGEX (tags/\([^)]*\)) |\1 |g" <tmp
 }
 
 #
@@ -111,8 +113,8 @@ check_outcome () {
 	shift &&
 	param="$*" &&
 	test_expect_$outcome "log $param" '
-		git log --pretty="$FMT" --parents $param |
-		unnote >actual &&
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
 		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
 		test_cmp expect check
 	'
@@ -151,8 +153,8 @@ check_result 'L K I H G B' --exclude-first-parent-only --first-parent L ^F
 check_result 'E C B A' --full-history E -- lost
 test_expect_success 'full history simplification without parent' '
 	printf "%s\n" E C B A >expect &&
-	git log --pretty="$FMT" --full-history E -- lost |
-	unnote >actual &&
+	git log --pretty="$FMT" --full-history E -- lost >out &&
+	unnote >actual <out &&
 	sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
 	test_cmp expect check
 '

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@ note () {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`unnote () {`
`15`		`- git name-rev --tags --annotate-stdin \| sed -e "s\|$OID_REGEX (tags/\([^)]*\)) \|\1 \|g"`
	`15`	`+ test_when_finished "rm -f tmp" &&`
	`16`	`+ git name-rev --tags --annotate-stdin >tmp &&`
	`17`	`+ sed -e "s\|$OID_REGEX (tags/\([^)]*\)) \|\1 \|g" <tmp`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`#`
`@@ -111,8 +113,8 @@ check_outcome () {`
`111`	`113`	`shift &&`
`112`	`114`	`param="$*" &&`
`113`	`115`	`test_expect_$outcome "log $param" '`
`114`		`- git log --pretty="$FMT" --parents $param \|`
`115`		`- unnote >actual &&`
	`116`	`+ git log --pretty="$FMT" --parents $param >out &&`
	`117`	`+ unnote >actual <out &&`
`116`	`118`	`sed -e "s/^.* \([^ ]\) ./\1/" >check <actual &&`
`117`	`119`	`test_cmp expect check`
`118`	`120`	`'`
`@@ -151,8 +153,8 @@ check_result 'L K I H G B' --exclude-first-parent-only --first-parent L ^F`
`151`	`153`	`check_result 'E C B A' --full-history E -- lost`
`152`	`154`	`test_expect_success 'full history simplification without parent' '`
`153`	`155`	`printf "%s\n" E C B A >expect &&`
`154`		`- git log --pretty="$FMT" --full-history E -- lost \|`
`155`		`- unnote >actual &&`
	`156`	`+ git log --pretty="$FMT" --full-history E -- lost >out &&`
	`157`	`+ unnote >actual <out &&`
`156`	`158`	`sed -e "s/^.* \([^ ]\) ./\1/" >check <actual &&`
`157`	`159`	`test_cmp expect check`
`158`	`160`	`'`