diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-01-20 21:26:35 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-01-20 21:26:35 +0100 |
| commit | 72521ab9fd8a47e5b9df4b99b7289531124df5e7 (patch) | |
| tree | 48acb41933073d9dbdf491f890d9534f14ee7f85 /Makefile.am | |
| parent | e8015e6e28fe7d287fc1d5d8bfd82ca65c51326c (diff) | |
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.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index b6a4e3e4e5..b368e107e9 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 # ------------------------------------------------------------------------------ |