remote-helpers: tests: use python directly
These remote helpers use 'env python', not PYTHON_PATH, so that's where we should check for the extensions. Otherwise, if 'python' is not PYTHON_PATH (e.g. /usr/bin/python: Makefile's default), there will be a mismatch between the python libraries actually accessible to the remote helpers. Suggested by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
		
				
					committed by
					
						
						Junio C Hamano
					
				
			
			
				
	
			
			
			
						parent
						
							5e49f30c85
						
					
				
				
					commit
					02a607260f
				
			@ -12,7 +12,7 @@ if ! test_have_prereq PYTHON; then
 | 
			
		||||
	test_done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if ! "$PYTHON_PATH" -c 'import bzrlib'; then
 | 
			
		||||
if ! python -c 'import bzrlib'; then
 | 
			
		||||
	skip_all='skipping remote-bzr tests; bzr not available'
 | 
			
		||||
	test_done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
@ -15,7 +15,7 @@ if ! test_have_prereq PYTHON; then
 | 
			
		||||
	test_done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if ! "$PYTHON_PATH" -c 'import mercurial'; then
 | 
			
		||||
if ! python -c 'import mercurial'; then
 | 
			
		||||
	skip_all='skipping remote-hg tests; mercurial not available'
 | 
			
		||||
	test_done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
@ -15,12 +15,12 @@ if ! test_have_prereq PYTHON; then
 | 
			
		||||
	test_done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if ! "$PYTHON_PATH" -c 'import mercurial'; then
 | 
			
		||||
if ! python -c 'import mercurial'; then
 | 
			
		||||
	skip_all='skipping remote-hg tests; mercurial not available'
 | 
			
		||||
	test_done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if ! "$PYTHON_PATH" -c 'import hggit'; then
 | 
			
		||||
if ! python -c 'import hggit'; then
 | 
			
		||||
	skip_all='skipping remote-hg tests; hg-git not available'
 | 
			
		||||
	test_done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
@ -15,7 +15,7 @@ if ! test_have_prereq PYTHON; then
 | 
			
		||||
	test_done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if ! "$PYTHON_PATH" -c 'import mercurial'; then
 | 
			
		||||
if ! python -c 'import mercurial'; then
 | 
			
		||||
	skip_all='skipping remote-hg tests; mercurial not available'
 | 
			
		||||
	test_done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user