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>
Felipe Contreras committed
May 17, 2013 at 16:10 UTC
02a607260fdbaed7717935df68fb76b1a6e577c0
4 files changed
+5
-5
contrib/remote-helpers/test-bzr.sh
+1
-1
@@ -12,7 +12,7 @@ if ! test_have_prereq PYTHON; then
12
test_done
13
fi
14
15
-if ! "$PYTHON_PATH" -c 'import bzrlib'; then
15
+if ! python -c 'import bzrlib'; then
16
skip_all='skipping remote-bzr tests; bzr not available'
17
test_done
18
fi
contrib/remote-helpers/test-hg-bidi.sh
+1
-1
@@ -15,7 +15,7 @@ if ! test_have_prereq PYTHON; then
15
test_done
16
fi
17
18
-if ! "$PYTHON_PATH" -c 'import mercurial'; then
18
+if ! python -c 'import mercurial'; then
19
skip_all='skipping remote-hg tests; mercurial not available'
20
test_done
21
fi
contrib/remote-helpers/test-hg-hg-git.sh
+2
-2
@@ -15,12 +15,12 @@ if ! test_have_prereq PYTHON; then
15
test_done
16
fi
17
18
-if ! "$PYTHON_PATH" -c 'import mercurial'; then
18
+if ! python -c 'import mercurial'; then
19
skip_all='skipping remote-hg tests; mercurial not available'
20
test_done
21
fi
22
23
-if ! "$PYTHON_PATH" -c 'import hggit'; then
23
+if ! python -c 'import hggit'; then
24
skip_all='skipping remote-hg tests; hg-git not available'
25
test_done
26
fi
contrib/remote-helpers/test-hg.sh
+1
-1
@@ -15,7 +15,7 @@ if ! test_have_prereq PYTHON; then
15
test_done
16
fi
17
18
-if ! "$PYTHON_PATH" -c 'import mercurial'; then
18
+if ! python -c 'import mercurial'; then
19
skip_all='skipping remote-hg tests; mercurial not available'
20
test_done
21
fi