diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-03-09 18:21:42 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-03-09 18:21:42 +0100 |
| commit | bd7e03af007c4e857ed0370eba9e903d6b561937 (patch) | |
| tree | 23b7f66162ff1a45d29c5a03fe74c381ffec0ef3 /Makefile.am | |
| parent | 280d397ab313b647fbd824d1cb58eb8323c74501 (diff) | |
| parent | 58015d7815bce405c7c0ac082d8c2f407ec07eeb (diff) | |
Merge pull request #2755 from keszybz/more-tests
Enable more tests by default, and even more with `--enable-tests=unsafe`
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 0f17bad8b1..04553d81b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,8 +131,12 @@ TEST_EXTENSIONS = .py PY_LOG_COMPILER = $(PYTHON) DISABLE_HARD_ERRORS = yes if ENABLE_TESTS -noinst_PROGRAMS = $(manual_tests) $(tests) +noinst_PROGRAMS = $(manual_tests) $(tests) $(unsafe_tests) TESTS = $(tests) +if ENABLE_UNSAFE_TESTS +TESTS += \ + $(unsafe_tests) +endif else noinst_PROGRAMS = TESTS = @@ -1387,19 +1391,17 @@ EXTRA_DIST += \ manual_tests += \ test-ns \ - test-loopback \ - test-hostname \ - test-daemon \ test-cgroup \ test-install \ - test-watchdog \ - test-log \ - test-ipcrm \ test-btrfs \ test-acd \ test-ipv4ll-manual \ test-ask-password-api +unsafe_tests = \ + test-hostname \ + test-ipcrm + if HAVE_LIBIPTC manual_tests += \ test-firewall-util @@ -1411,7 +1413,11 @@ manual_tests += \ endif tests += \ + test-daemon \ + test-log \ + test-loopback \ test-engine \ + test-watchdog \ test-cgroup-mask \ test-job-type \ test-env-replace \ @@ -1651,13 +1657,13 @@ test_dns_domain_LDADD = \ if ENABLE_EFI -manual_tests += \ - test-boot-timestamp +tests += \ + test-boot-timestamps -test_boot_timestamp_SOURCES = \ +test_boot_timestamps_SOURCES = \ src/test/test-boot-timestamps.c -test_boot_timestamp_LDADD = \ +test_boot_timestamps_LDADD = \ libshared.la endif @@ -3703,8 +3709,10 @@ endif endif endif +tests += \ + test-libudev + manual_tests += \ - test-libudev \ test-udev test_libudev_SOURCES = \ @@ -4115,11 +4123,9 @@ catalog-remove-hook: UNINSTALL_DATA_HOOKS += \ catalog-remove-hook -manual_tests += \ - test-journal-enum - tests += \ test-journal \ + test-journal-enum \ test-journal-send \ test-journal-syslog \ test-journal-match \ |