 16d4bd4f14
			
		
	
	16d4bd4f14
	
	
	
		
			
			Mark some tests that match "*diff*" as passing when git is compiled with SANITIZE=leak. They'll now be listed as running under the "GIT_TEST_PASSING_SANITIZE_LEAK=true" test mode (the "linux-leaks" CI target). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			45 lines
		
	
	
		
			978 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			45 lines
		
	
	
		
			978 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
| #!/bin/sh
 | |
| #
 | |
| # Copyright (c) Jim Meyering
 | |
| #
 | |
| test_description='diff honors config option, diff.suppressBlankEmpty'
 | |
| 
 | |
| TEST_PASSES_SANITIZE_LEAK=true
 | |
| . ./test-lib.sh
 | |
| 
 | |
| cat <<\EOF >expected ||
 | |
| diff --git a/f b/f
 | |
| index 5f6a263..8cb8bae 100644
 | |
| --- a/f
 | |
| +++ b/f
 | |
| @@ -1,2 +1,2 @@
 | |
| 
 | |
| -x
 | |
| +y
 | |
| EOF
 | |
| exit 1
 | |
| 
 | |
| test_expect_success "$test_description" '
 | |
| 	printf "\nx\n" > f &&
 | |
| 	before=$(git hash-object f) &&
 | |
| 	before=$(git rev-parse --short $before) &&
 | |
| 	git add f &&
 | |
| 	git commit -q -m. f &&
 | |
| 	printf "\ny\n" > f &&
 | |
| 	after=$(git hash-object f) &&
 | |
| 	after=$(git rev-parse --short $after) &&
 | |
| 	sed -e "s/^index .*/index $before..$after 100644/" expected >exp &&
 | |
| 	git config --bool diff.suppressBlankEmpty true &&
 | |
| 	git diff f > actual &&
 | |
| 	test_cmp exp actual &&
 | |
| 	perl -i.bak -p -e "s/^\$/ /" exp &&
 | |
| 	git config --bool diff.suppressBlankEmpty false &&
 | |
| 	git diff f > actual &&
 | |
| 	test_cmp exp actual &&
 | |
| 	git config --bool --unset diff.suppressBlankEmpty &&
 | |
| 	git diff f > actual &&
 | |
| 	test_cmp exp actual
 | |
| '
 | |
| 
 | |
| test_done
 |