t: assume test_cmp produces verbose output
Some tests call test_cmp, and if it fails show the actual output generated. This is mostly pointless, as test_cmp will already show a diff between the expected and actual output. It also fools --chain-lint by putting an "||" in the middle of the chain, so we'd rather not use this construct. Note that these cases actually show a pre-processed version of the data, rather than exactly what test_cmp would show. However, test_cmp's output is generally good for pointing the user in the right direction, and they can then dig in the trash directory themselves if they want to see more details. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
							parent
							
								
									99094a7ad4
								
							
						
					
					
						commit
						5ca812a19c
					
				|  | @ -95,10 +95,7 @@ check_outcome () { | ||||||
| 		git log --pretty="$FMT" --parents $param | | 		git log --pretty="$FMT" --parents $param | | ||||||
| 		unnote >actual && | 		unnote >actual && | ||||||
| 		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual && | 		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual && | ||||||
| 		test_cmp expect check || { | 		test_cmp expect check | ||||||
| 			cat actual |  | ||||||
| 			false |  | ||||||
| 		} |  | ||||||
| 	' | 	' | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -121,10 +118,7 @@ test_expect_success 'full history simplification without parent' ' | ||||||
| 	git log --pretty="$FMT" --full-history E -- lost | | 	git log --pretty="$FMT" --full-history E -- lost | | ||||||
| 	unnote >actual && | 	unnote >actual && | ||||||
| 	sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual && | 	sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual && | ||||||
| 	test_cmp expect check || { | 	test_cmp expect check | ||||||
| 		cat actual |  | ||||||
| 		false |  | ||||||
| 	} |  | ||||||
| ' | ' | ||||||
|  |  | ||||||
| test_expect_success '--full-diff is not affected by --parents' ' | test_expect_success '--full-diff is not affected by --parents' ' | ||||||
|  |  | ||||||
|  | @ -92,10 +92,7 @@ check_outcome () { | ||||||
| 		git log --format="$FMT" $param | | 		git log --format="$FMT" $param | | ||||||
| 		unnote >actual && | 		unnote >actual && | ||||||
| 		sed -e "$munge_actual" <actual >check && | 		sed -e "$munge_actual" <actual >check && | ||||||
| 		test_cmp expect check || { | 		test_cmp expect check | ||||||
| 			cat actual |  | ||||||
| 			false |  | ||||||
| 		} |  | ||||||
| 	' | 	' | ||||||
| } | } | ||||||
|  |  | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Jeff King
						Jeff King