aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-09-18 15:05:17 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2018-09-18 15:09:05 +0200
commitccdb970c5766b9cc8e62a1e7d6fbdfe2339396c5 (patch)
tree2188bf3c3d7a5d8c97f8603ed29b0a76165a2e25
parenta5b36a09044768e8c7db3f0670af8321259f7402 (diff)
make: always allow running python tests manually
Keep the rules to run the external-tests in tests/Makefile available for invocation, to allow conveniently launching the tests manualy without the need to pass --with-external-tests to ./configure first. Change-Id: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1
-rw-r--r--tests/Makefile.am9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7e45da4..e07749c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,6 +44,10 @@ python-tests:
# don't run vty and ctrl tests concurrently so that the ports don't conflict
$(MAKE) vty-test
$(MAKE) ctrl-test
+else
+python-tests:
+ echo "Not running python-based external tests (determined at configure-time)"
+endif
VTY_TEST_DB = hlr_vty_test.db
@@ -75,11 +79,6 @@ ctrl-test:
-rm -f $(CTRL_TEST_DB)
-rm $(CTRL_TEST_DB)-*
-else
-python-tests:
- echo "Not running python-based tests (determined at configure-time)"
-endif
-
check-local: atconfig $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
$(MAKE) $(AM_MAKEFLAGS) python-tests