mirror of
https://github.com/mnauw/git-remote-hg.git
synced 2025-11-05 02:55:40 +01:00
test: use generic python reference rather than python2
This commit is contained in:
@@ -17,7 +17,7 @@ then
|
||||
test_done
|
||||
fi
|
||||
|
||||
if ! python2 -c 'import mercurial' > /dev/null 2>&1
|
||||
if ! python -c 'import mercurial' > /dev/null 2>&1
|
||||
then
|
||||
skip_all='skipping remote-hg tests; mercurial not available'
|
||||
test_done
|
||||
|
||||
@@ -17,7 +17,7 @@ then
|
||||
test_done
|
||||
fi
|
||||
|
||||
if ! python2 -c 'import mercurial' > /dev/null 2>&1
|
||||
if ! python -c 'import mercurial' > /dev/null 2>&1
|
||||
then
|
||||
skip_all='skipping remote-hg tests; mercurial not available'
|
||||
test_done
|
||||
|
||||
@@ -17,16 +17,16 @@ then
|
||||
test_done
|
||||
fi
|
||||
|
||||
if ! python2 -c 'import mercurial' > /dev/null 2>&1
|
||||
if ! python -c 'import mercurial' > /dev/null 2>&1
|
||||
then
|
||||
skip_all='skipping remote-hg tests; mercurial not available'
|
||||
test_done
|
||||
fi
|
||||
|
||||
if python2 -c 'import hggit' > /dev/null 2>&1
|
||||
if python -c 'import hggit' > /dev/null 2>&1
|
||||
then
|
||||
hggit=hggit
|
||||
elif python2 -c 'import hgext.git' > /dev/null 2>&1
|
||||
elif python -c 'import hgext.git' > /dev/null 2>&1
|
||||
then
|
||||
hggit=hgext.git
|
||||
else
|
||||
|
||||
@@ -26,7 +26,7 @@ then
|
||||
test_done
|
||||
fi
|
||||
|
||||
if ! python2 -c 'import mercurial' > /dev/null 2>&1
|
||||
if ! python -c 'import mercurial' > /dev/null 2>&1
|
||||
then
|
||||
skip_all='skipping remote-hg tests; mercurial not available'
|
||||
test_done
|
||||
|
||||
@@ -102,7 +102,7 @@ class Component
|
||||
def build
|
||||
Dir.chdir(dir) do
|
||||
targets = %w[build_py build_ext].map { |e| [e, '--build-lib', "#{$builddir}/python"] }
|
||||
run_cmd %w[python2 setup.py --quiet] + targets.flatten
|
||||
run_cmd %w[python setup.py --quiet] + targets.flatten
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user