diff options
| author |  Thomas Jost <schnouki@schnouki.net> | 2011-12-07 10:46:18 +0100 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2011-12-11 10:43:16 -0400 |
| commit | ae13d612c14f654d4bc12c93481227e4d24fda82 (patch) | |
| tree | 1a6b24a4813f452c186d3f6100c144aadc15d660 /test | |
| parent | 2621f6cef19acc99745c389f5e324fea55f655d8 (diff) | |
test: use python2 instead of python if available
Some distros (Arch Linux) ship Python as python2 and Python 3 as python.
Checking for python2 is necessary for the Python tests to work on these
platforms.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-lib.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index bffac77a..6be93fe3 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -923,8 +923,14 @@ test_python() { export LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib export PYTHONPATH=$TEST_DIRECTORY/../bindings/python + # Some distros (e.g. Arch Linux) ship Python 2.* as /usr/bin/python2, + # most others as /usr/bin/python. So first try python2, and fallback to + # python if python2 doesn't exist. + cmd=python2 + [[ "$test_missing_external_prereq_python2_" = t ]] && cmd=python + (echo "import sys; _orig_stdout=sys.stdout; sys.stdout=open('OUTPUT', 'w')"; cat) \ - | python - + | $cmd - } # Creates a script that counts how much time it is executed and calls @@ -1189,3 +1195,4 @@ test_declare_external_prereq emacsclient test_declare_external_prereq gdb test_declare_external_prereq gpg test_declare_external_prereq python +test_declare_external_prereq python2 |