t0107: Skip ZIP tests if unzip(1) isn't available
Note that we cannot use skip_all here since some tests have already been executed when ZIP tests are reached. Use test prerequisites to skip everything using unzip(1) if the binary is not available instead. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
This commit is contained in:
		
				
					committed by
					
						
						Jason A. Donenfeld
					
				
			
			
				
	
			
			
			
						부모
						
							016364d4ed
						
					
				
				
					커밋
					81bf4d32b3
				
			@@ -54,21 +54,27 @@ test_expect_success 'strip off the header lines (zip)' '
 | 
			
		||||
	tail -n +6 tmp >master.zip
 | 
			
		||||
'
 | 
			
		||||
 | 
			
		||||
test_expect_success 'verify zip format' '
 | 
			
		||||
if test -n "$(which unzip 2>/dev/null)"; then
 | 
			
		||||
	test_set_prereq UNZIP
 | 
			
		||||
else
 | 
			
		||||
	say 'Skipping ZIP validation tests: unzip not found'
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
test_expect_success UNZIP 'verify zip format' '
 | 
			
		||||
	unzip -t master.zip
 | 
			
		||||
'
 | 
			
		||||
 | 
			
		||||
test_expect_success 'unzip' '
 | 
			
		||||
test_expect_success UNZIP 'unzip' '
 | 
			
		||||
	rm -rf master &&
 | 
			
		||||
	unzip master.zip
 | 
			
		||||
'
 | 
			
		||||
 | 
			
		||||
test_expect_success 'count files (zip)' '
 | 
			
		||||
test_expect_success UNZIP 'count files (zip)' '
 | 
			
		||||
	ls master/ >output &&
 | 
			
		||||
	test_line_count = 5 output
 | 
			
		||||
'
 | 
			
		||||
 | 
			
		||||
test_expect_success 'verify unzipped file-5' '
 | 
			
		||||
test_expect_success UNZIP 'verify unzipped file-5' '
 | 
			
		||||
	grep "^5$" master/file-5 &&
 | 
			
		||||
	test_line_count = 1 master/file-5
 | 
			
		||||
'
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user