summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2015-01-20 12:46:28 +0100
committerMartin Pitt <martin.pitt@ubuntu.com>2015-01-20 12:49:08 +0100
commit6c8f2e7d78b1fe280588dc91beae90cdf36fcd49 (patch)
treed2d9f30c090daf38395820163d4133b2c7ba825c
parentc6be83c16d605fb2e66b2a5a8ff0f4a7a6e0e1e4 (diff)
test: Use configured Python
Don't hardcode "python" or /usr/bin/python, but use the configured $(PYTHON).
-rw-r--r--Makefile.am1
-rw-r--r--[-rwxr-xr-x]test/rule-syntax-check.py1
-rwxr-xr-xtest/rules-test.sh6
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 5b789d0027..788e63498c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,7 @@ check_DATA =
tests=
manual_tests =
if ENABLE_TESTS
+export PYTHON
noinst_PROGRAMS = $(manual_tests) $(tests)
TESTS = $(tests)
else
diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py
index 8da38cd784..8c0180bd3c 100755..100644
--- a/test/rule-syntax-check.py
+++ b/test/rule-syntax-check.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# Simple udev rules syntax checker
#
# (C) 2010 Canonical Ltd.
diff --git a/test/rules-test.sh b/test/rules-test.sh
index 47d42cb3fa..219575360e 100755
--- a/test/rules-test.sh
+++ b/test/rules-test.sh
@@ -20,9 +20,9 @@
[ -n "$srcdir" ] || srcdir=`dirname $0`/..
# skip if we don't have python
-type python >/dev/null 2>&1 || {
- echo "$0: No python installed, skipping udev rule syntax check"
+type ${PYTHON:-python} >/dev/null 2>&1 || {
+ echo "$0: No $PYTHON installed, skipping udev rule syntax check"
exit 0
}
-$srcdir/test/rule-syntax-check.py `find $srcdir/rules -name '*.rules'`
+$PYTHON $srcdir/test/rule-syntax-check.py `find $srcdir/rules -name '*.rules'`