[systemd-commits] Makefile.am test/rules-test.sh

[Martin Pitt]

 Makefile.am        |   12 +++++++++---
 test/rules-test.sh |   26 --------------------------
 2 files changed, 9 insertions(+), 29 deletions(-)

New commits:
commit 72521ab9fd8a47e5b9df4b99b7289531124df5e7
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Tue Jan 20 21:26:35 2015 +0100

    test: eliminate shell wrapper for Python test
    
    Use the parallel test runner's TEST_EXTENSIONS/*_LOG_COMPILER feature
    (https://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness.html)
    to run *.py tests through $(PYTHON), and only if we have python
    available/enabled.
    
    This eliminates the need of having shell wrappers, thus drop
    test/rules-test.sh.

diff --git a/Makefile.am b/Makefile.am
index b6a4e3e..b368e10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,8 +148,9 @@ check_PROGRAMS =
 check_DATA =
 tests=
 manual_tests =
+TEST_EXTENSIONS = .py
+PY_LOG_COMPILER = $(PYTHON)
 if ENABLE_TESTS
-export PYTHON
 noinst_PROGRAMS = $(manual_tests) $(tests)
 TESTS = $(tests)
 else
@@ -3767,7 +3768,13 @@ endif
 # ------------------------------------------------------------------------------
 TESTS += \
 	test/udev-test.pl \
-	test/rules-test.sh
+	$(NULL)
+
+if HAVE_PYTHON
+TESTS += \
+	test/rule-syntax-check.py \
+	$(NULL)
+endif
 
 manual_tests += \
 	test-libudev \
@@ -3811,7 +3818,6 @@ DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
 EXTRA_DIST += \
 	test/sys.tar.xz \
 	test/udev-test.pl \
-	test/rules-test.sh \
 	test/rule-syntax-check.py
 
 # ------------------------------------------------------------------------------
diff --git a/test/rules-test.sh b/test/rules-test.sh
deleted file mode 100755
index 50b83a3..0000000
--- a/test/rules-test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# Call the udev rule syntax checker on all rules that we ship
-#
-# (C) 2010 Canonical Ltd.
-# Author: Martin Pitt <martin.pitt at ubuntu.com>
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-# skip if we don't have python
-type ${PYTHON:-python} >/dev/null 2>&1 || {
-        echo "$0: No $PYTHON installed, skipping udev rule syntax check"
-        exit 0
-}
-
-$PYTHON $srcdir/test/rule-syntax-check.py