Skip --merge-order test when built with NO_OPENSSL
When built with NO_OPENSSL, rev-list --merge-order does not work, causing t6001 test to fail. Detect that and skip this test to allow continuing to the rest of the tests. Signed-off-by: Junio C Hamano <junkio@cox.net>maint
							parent
							
								
									dd53c7ab29
								
							
						
					
					
						commit
						eb3c430a85
					
				|  | @ -8,6 +8,13 @@ test_description='Tests git-rev-list --merge-order functionality' | ||||||
| . ./test-lib.sh | . ./test-lib.sh | ||||||
| . ../t6000lib.sh # t6xxx specific functions | . ../t6000lib.sh # t6xxx specific functions | ||||||
|  |  | ||||||
|  | if git-rev-list --merge-order 2>&1 | grep 'OpenSSL not linked' >/dev/null | ||||||
|  | then | ||||||
|  |     test_expect_success 'skipping merge-order test' : | ||||||
|  |     test_done | ||||||
|  |     exit | ||||||
|  | fi     | ||||||
|  |  | ||||||
| # test-case specific test function | # test-case specific test function | ||||||
| check_adjacency() | check_adjacency() | ||||||
| { | { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Junio C Hamano
						Junio C Hamano