From 6c8f2e7d78b1fe280588dc91beae90cdf36fcd49 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 20 Jan 2015 12:46:28 +0100 Subject: [PATCH] test: Use configured Python Don't hardcode "python" or /usr/bin/python, but use the configured $(PYTHON). --- Makefile.am | 1 + test/rule-syntax-check.py | 1 - test/rules-test.sh | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 test/rule-syntax-check.py diff --git a/Makefile.am b/Makefile.am index 5b789d002..788e63498 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 old mode 100755 new mode 100644 index 8da38cd78..8c0180bd3 --- 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 47d42cb3f..219575360 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'` -- 2.30.2