From b0ac3401c8a67f3a8962b65f7978cda9aa3fca6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 14 Feb 2017 01:03:40 -0500 Subject: Revert "test: make unit tests relocatable and add an "install-tests" make target" --- Makefile.am | 48 +++++++-------------- .../test-data/_443._tcp.fedoraproject.org.pkts | Bin 0 -> 169 bytes .../test-data/_openpgpkey.fedoraproject.org.pkts | Bin 0 -> 986 bytes src/resolve/test-data/fake-caa.pkts | Bin 0 -> 196 bytes src/resolve/test-data/fedoraproject.org.pkts | Bin 0 -> 1483 bytes src/resolve/test-data/gandi.net.pkts | Bin 0 -> 1010 bytes src/resolve/test-data/google.com.pkts | Bin 0 -> 747 bytes src/resolve/test-data/kyhwana.org.pkts | Bin 0 -> 1803 bytes src/resolve/test-data/root.pkts | Bin 0 -> 1061 bytes ...sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts | Bin 0 -> 330 bytes src/resolve/test-data/teamits.com.pkts | Bin 0 -> 1021 bytes .../test-data/zbyszek@fedoraproject.org.pkts | Bin 0 -> 2533 bytes src/resolve/test-dns-packet.c | 4 +- src/shared/tests.c | 13 ------ src/shared/tests.h | 1 - src/test/test-cgroup-mask.c | 2 +- src/test/test-engine.c | 2 +- src/test/test-execute.c | 2 +- src/test/test-helper.h | 5 --- src/test/test-path.c | 2 +- src/test/test-sched-prio.c | 2 +- test/test-resolve/_443._tcp.fedoraproject.org.pkts | Bin 169 -> 0 bytes .../_openpgpkey.fedoraproject.org.pkts | Bin 986 -> 0 bytes test/test-resolve/fake-caa.pkts | Bin 196 -> 0 bytes test/test-resolve/fedoraproject.org.pkts | Bin 1483 -> 0 bytes test/test-resolve/gandi.net.pkts | Bin 1010 -> 0 bytes test/test-resolve/google.com.pkts | Bin 747 -> 0 bytes test/test-resolve/kyhwana.org.pkts | Bin 1803 -> 0 bytes test/test-resolve/root.pkts | Bin 1061 -> 0 bytes ...sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts | Bin 330 -> 0 bytes test/test-resolve/teamits.com.pkts | Bin 1021 -> 0 bytes test/test-resolve/zbyszek@fedoraproject.org.pkts | Bin 2533 -> 0 bytes 32 files changed, 21 insertions(+), 60 deletions(-) create mode 100644 src/resolve/test-data/_443._tcp.fedoraproject.org.pkts create mode 100644 src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts create mode 100644 src/resolve/test-data/fake-caa.pkts create mode 100644 src/resolve/test-data/fedoraproject.org.pkts create mode 100644 src/resolve/test-data/gandi.net.pkts create mode 100644 src/resolve/test-data/google.com.pkts create mode 100644 src/resolve/test-data/kyhwana.org.pkts create mode 100644 src/resolve/test-data/root.pkts create mode 100644 src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts create mode 100644 src/resolve/test-data/teamits.com.pkts create mode 100644 src/resolve/test-data/zbyszek@fedoraproject.org.pkts delete mode 100644 test/test-resolve/_443._tcp.fedoraproject.org.pkts delete mode 100644 test/test-resolve/_openpgpkey.fedoraproject.org.pkts delete mode 100644 test/test-resolve/fake-caa.pkts delete mode 100644 test/test-resolve/fedoraproject.org.pkts delete mode 100644 test/test-resolve/gandi.net.pkts delete mode 100644 test/test-resolve/google.com.pkts delete mode 100644 test/test-resolve/kyhwana.org.pkts delete mode 100644 test/test-resolve/root.pkts delete mode 100644 test/test-resolve/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts delete mode 100644 test/test-resolve/teamits.com.pkts delete mode 100644 test/test-resolve/zbyszek@fedoraproject.org.pkts diff --git a/Makefile.am b/Makefile.am index c45755f36e..77e5aa7402 100644 --- a/Makefile.am +++ b/Makefile.am @@ -93,7 +93,6 @@ kernelinstalldir = $(prefix)/lib/kernel/install.d factory_etcdir = $(datadir)/factory/etc factory_pamdir = $(datadir)/factory/etc/pam.d bootlibdir = $(prefix)/lib/systemd/boot/efi -testsdir = $(prefix)/lib/systemd/tests # And these are the special ones for / rootprefix=@rootprefix@ @@ -134,7 +133,6 @@ check_DATA = dist_rootlibexec_DATA = tests= manual_tests = -TEST_DATA_FILES = TEST_EXTENSIONS = .py PY_LOG_COMPILER = $(PYTHON) DISABLE_HARD_ERRORS = yes @@ -152,7 +150,6 @@ endif AM_TESTS_ENVIRONMENT = \ export SYSTEMD_KBD_MODEL_MAP=$(abs_top_srcdir)/src/locale/kbd-model-map; \ export SYSTEMD_LANGUAGE_FALLBACK_MAP=$(abs_top_srcdir)/src/locale/language-fallback-map; \ - export TEST_DIR=$(abs_top_srcdir)/test; \ export PATH=$(abs_top_builddir):$$PATH; if ENABLE_BASH_COMPLETION @@ -221,6 +218,7 @@ AM_CPPFLAGS = \ -DLIBDIR=\"$(libdir)\" \ -DROOTLIBDIR=\"$(rootlibdir)\" \ -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ + -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/basic \ -I $(top_srcdir)/src/basic \ @@ -1608,7 +1606,7 @@ tests += \ test-seccomp endif -TEST_DATA_FILES += \ +EXTRA_DIST += \ test/a.service \ test/basic.target \ test/b.service \ @@ -5640,7 +5638,7 @@ test_dns_packet_SOURCES = \ test_dns_packet_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I $(top_srcdir)/src/test + -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\" test_dns_packet_CFLAGS = \ $(AM_CFLAGS) \ @@ -5651,20 +5649,18 @@ test_dns_packet_LDADD = \ $(GCRYPT_LIBS) \ -lm -TEST_DATA_FILES += \ - test/test-resolve/_openpgpkey.fedoraproject.org.pkts \ - test/test-resolve/fedoraproject.org.pkts \ - test/test-resolve/gandi.net.pkts \ - test/test-resolve/google.com.pkts \ - test/test-resolve/root.pkts \ - test/test-resolve/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \ - test/test-resolve/teamits.com.pkts \ - test/test-resolve/zbyszek@fedoraproject.org.pkts \ - test/test-resolve/_443._tcp.fedoraproject.org.pkts \ - test/test-resolve/kyhwana.org.pkts \ - test/test-resolve/fake-caa.pkts - -EXTRA_DIST += $(TEST_DATA_FILES) +EXTRA_DIST += \ + src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \ + src/resolve/test-data/fedoraproject.org.pkts \ + src/resolve/test-data/gandi.net.pkts \ + src/resolve/test-data/google.com.pkts \ + src/resolve/test-data/root.pkts \ + src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \ + src/resolve/test-data/teamits.com.pkts \ + src/resolve/test-data/zbyszek@fedoraproject.org.pkts \ + src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \ + src/resolve/test-data/kyhwana.org.pkts \ + src/resolve/test-data/fake-caa.pkts test_dnssec_SOURCES = \ src/resolve/test-dnssec.c \ @@ -6698,20 +6694,6 @@ tests += \ test-libsystemd-sym \ test-libudev-sym -.PHONY: install-tests -install-tests: $(tests) $(TEST_DATA_FILES) - for f in $(tests); do \ - if [ -x .libs/$$f ]; then \ - install -D -m 755 .libs/$$f $(DESTDIR)/$(testsdir)/$$f; \ - else \ - install -D -m 755 $$f $(DESTDIR)/$(testsdir)/$$f; \ - fi; \ - done - for f in $(TEST_DATA_FILES); do \ - install -D -m 644 $$f $(DESTDIR)/$(testsdir)/testdata/$${f#test/}; \ - done - - .PHONY: cppcheck cppcheck: cppcheck --enable=all -q $(top_srcdir) diff --git a/src/resolve/test-data/_443._tcp.fedoraproject.org.pkts b/src/resolve/test-data/_443._tcp.fedoraproject.org.pkts new file mode 100644 index 0000000000..a383c6286d Binary files /dev/null and b/src/resolve/test-data/_443._tcp.fedoraproject.org.pkts differ diff --git a/src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts b/src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts new file mode 100644 index 0000000000..15de02e997 Binary files /dev/null and b/src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts differ diff --git a/src/resolve/test-data/fake-caa.pkts b/src/resolve/test-data/fake-caa.pkts new file mode 100644 index 0000000000..1c3ecc5491 Binary files /dev/null and b/src/resolve/test-data/fake-caa.pkts differ diff --git a/src/resolve/test-data/fedoraproject.org.pkts b/src/resolve/test-data/fedoraproject.org.pkts new file mode 100644 index 0000000000..17874844d9 Binary files /dev/null and b/src/resolve/test-data/fedoraproject.org.pkts differ diff --git a/src/resolve/test-data/gandi.net.pkts b/src/resolve/test-data/gandi.net.pkts new file mode 100644 index 0000000000..5ef51e0c8e Binary files /dev/null and b/src/resolve/test-data/gandi.net.pkts differ diff --git a/src/resolve/test-data/google.com.pkts b/src/resolve/test-data/google.com.pkts new file mode 100644 index 0000000000..f98c4cd855 Binary files /dev/null and b/src/resolve/test-data/google.com.pkts differ diff --git a/src/resolve/test-data/kyhwana.org.pkts b/src/resolve/test-data/kyhwana.org.pkts new file mode 100644 index 0000000000..e28a725c9a Binary files /dev/null and b/src/resolve/test-data/kyhwana.org.pkts differ diff --git a/src/resolve/test-data/root.pkts b/src/resolve/test-data/root.pkts new file mode 100644 index 0000000000..54ba668c75 Binary files /dev/null and b/src/resolve/test-data/root.pkts differ diff --git a/src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts b/src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts new file mode 100644 index 0000000000..a854249532 Binary files /dev/null and b/src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts differ diff --git a/src/resolve/test-data/teamits.com.pkts b/src/resolve/test-data/teamits.com.pkts new file mode 100644 index 0000000000..11deb39677 Binary files /dev/null and b/src/resolve/test-data/teamits.com.pkts differ diff --git a/src/resolve/test-data/zbyszek@fedoraproject.org.pkts b/src/resolve/test-data/zbyszek@fedoraproject.org.pkts new file mode 100644 index 0000000000..f0a6f982df Binary files /dev/null and b/src/resolve/test-data/zbyszek@fedoraproject.org.pkts differ diff --git a/src/resolve/test-dns-packet.c b/src/resolve/test-dns-packet.c index 3ca7e78495..956b155872 100644 --- a/src/resolve/test-dns-packet.c +++ b/src/resolve/test-dns-packet.c @@ -31,8 +31,6 @@ #include "strv.h" #include "unaligned.h" -#include "test-helper.h" - #define HASH_KEY SD_ID128_MAKE(d3,1e,48,90,4b,fa,4c,fe,af,9d,d5,a1,d7,2e,8a,b1) static void verify_rr_copy(DnsResourceRecord *rr) { @@ -117,7 +115,7 @@ int main(int argc, char **argv) { N = argc - 1; fnames = argv + 1; } else { - assert_se(glob(TEST_DATA_DIR("/test-resolve/*.pkts"), GLOB_NOSORT, NULL, &g) == 0); + assert_se(glob(RESOLVE_TEST_DIR "/*.pkts", GLOB_NOSORT, NULL, &g) == 0); N = g.gl_pathc; fnames = g.gl_pathv; } diff --git a/src/shared/tests.c b/src/shared/tests.c index 7034687725..409116290d 100644 --- a/src/shared/tests.c +++ b/src/shared/tests.c @@ -17,9 +17,6 @@ along with systemd; If not, see . ***/ -#include -#include -#include #include #include @@ -34,13 +31,3 @@ char* setup_fake_runtime_dir(void) { return p; } - -const char* get_exe_relative_testdata_dir(void) { - _cleanup_free_ char *exedir = NULL; - /* convenience: caller does not need to free result */ - static char testdir[PATH_MAX]; - - assert_se(readlink_and_make_absolute("/proc/self/exe", &exedir) >= 0); - assert_se(snprintf(testdir, sizeof(testdir), "%s/testdata", dirname(exedir)) > 0); - return testdir; -} diff --git a/src/shared/tests.h b/src/shared/tests.h index 0100b48937..93f09013a1 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.h @@ -20,4 +20,3 @@ ***/ char* setup_fake_runtime_dir(void); -const char* get_exe_relative_testdata_dir(void); diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index 630587aaf1..a027eb0fd2 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -34,7 +34,7 @@ static int test_cgroup_mask(void) { int r; /* Prepare the manager. */ - assert_se(set_unit_path(TEST_DATA_DIR("")) >= 0); + assert_se(set_unit_path(TEST_DIR) >= 0); r = manager_new(UNIT_FILE_USER, true, &m); if (r == -EPERM || r == -EACCES) { puts("manager_new: Permission denied. Skipping test."); diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 3ec2dfe10e..a651f6b683 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) { assert_se(runtime_dir = setup_fake_runtime_dir()); /* prepare the test */ - assert_se(set_unit_path(TEST_DATA_DIR("")) >= 0); + assert_se(set_unit_path(TEST_DIR) >= 0); r = manager_new(UNIT_FILE_USER, true, &m); if (MANAGER_SKIP_TEST(r)) { log_notice_errno(r, "Skipping test: manager_new: %m"); diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 145aa37a66..3a3ab3eb94 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -516,7 +516,7 @@ int main(int argc, char *argv[]) { } assert_se(setenv("XDG_RUNTIME_DIR", "/tmp/", 1) == 0); - assert_se(set_unit_path(TEST_DATA_DIR("/test-execute/")) >= 0); + assert_se(set_unit_path(TEST_DIR "/test-execute/") >= 0); /* Unset VAR1, VAR2 and VAR3 which are used in the PassEnvironment test * cases, otherwise (and if they are present in the environment), diff --git a/src/test/test-helper.h b/src/test/test-helper.h index 4e633ae6d8..ddb10f88fd 100644 --- a/src/test/test-helper.h +++ b/src/test/test-helper.h @@ -20,8 +20,6 @@ ***/ #include "sd-daemon.h" -#include "string-util.h" -#include "tests.h" #include "macro.h" @@ -41,6 +39,3 @@ -ENOENT, \ -ENOMEDIUM /* cannot determine cgroup */ \ ) - -#define TEST_DATA_DIR(subdir) \ - strjoina(getenv("TEST_DIR") ?: get_exe_relative_testdata_dir(), subdir) diff --git a/src/test/test-path.c b/src/test/test-path.c index d09df3e8a5..5e99d478ee 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -263,7 +263,7 @@ int main(int argc, char *argv[]) { log_open(); assert_se(runtime_dir = setup_fake_runtime_dir()); - assert_se(set_unit_path(TEST_DATA_DIR("/test-path/")) >= 0); + assert_se(set_unit_path(TEST_DIR "/test-path/") >= 0); for (test = tests; test && *test; test++) { int r; diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index dab64fea57..7b37910c33 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) { assert_se(runtime_dir = setup_fake_runtime_dir()); /* prepare the test */ - assert_se(set_unit_path(TEST_DATA_DIR("")) >= 0); + assert_se(set_unit_path(TEST_DIR) >= 0); r = manager_new(UNIT_FILE_USER, true, &m); if (MANAGER_SKIP_TEST(r)) { log_notice_errno(r, "Skipping test: manager_new: %m"); diff --git a/test/test-resolve/_443._tcp.fedoraproject.org.pkts b/test/test-resolve/_443._tcp.fedoraproject.org.pkts deleted file mode 100644 index a383c6286d..0000000000 Binary files a/test/test-resolve/_443._tcp.fedoraproject.org.pkts and /dev/null differ diff --git a/test/test-resolve/_openpgpkey.fedoraproject.org.pkts b/test/test-resolve/_openpgpkey.fedoraproject.org.pkts deleted file mode 100644 index 15de02e997..0000000000 Binary files a/test/test-resolve/_openpgpkey.fedoraproject.org.pkts and /dev/null differ diff --git a/test/test-resolve/fake-caa.pkts b/test/test-resolve/fake-caa.pkts deleted file mode 100644 index 1c3ecc5491..0000000000 Binary files a/test/test-resolve/fake-caa.pkts and /dev/null differ diff --git a/test/test-resolve/fedoraproject.org.pkts b/test/test-resolve/fedoraproject.org.pkts deleted file mode 100644 index 17874844d9..0000000000 Binary files a/test/test-resolve/fedoraproject.org.pkts and /dev/null differ diff --git a/test/test-resolve/gandi.net.pkts b/test/test-resolve/gandi.net.pkts deleted file mode 100644 index 5ef51e0c8e..0000000000 Binary files a/test/test-resolve/gandi.net.pkts and /dev/null differ diff --git a/test/test-resolve/google.com.pkts b/test/test-resolve/google.com.pkts deleted file mode 100644 index f98c4cd855..0000000000 Binary files a/test/test-resolve/google.com.pkts and /dev/null differ diff --git a/test/test-resolve/kyhwana.org.pkts b/test/test-resolve/kyhwana.org.pkts deleted file mode 100644 index e28a725c9a..0000000000 Binary files a/test/test-resolve/kyhwana.org.pkts and /dev/null differ diff --git a/test/test-resolve/root.pkts b/test/test-resolve/root.pkts deleted file mode 100644 index 54ba668c75..0000000000 Binary files a/test/test-resolve/root.pkts and /dev/null differ diff --git a/test/test-resolve/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts b/test/test-resolve/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts deleted file mode 100644 index a854249532..0000000000 Binary files a/test/test-resolve/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts and /dev/null differ diff --git a/test/test-resolve/teamits.com.pkts b/test/test-resolve/teamits.com.pkts deleted file mode 100644 index 11deb39677..0000000000 Binary files a/test/test-resolve/teamits.com.pkts and /dev/null differ diff --git a/test/test-resolve/zbyszek@fedoraproject.org.pkts b/test/test-resolve/zbyszek@fedoraproject.org.pkts deleted file mode 100644 index f0a6f982df..0000000000 Binary files a/test/test-resolve/zbyszek@fedoraproject.org.pkts and /dev/null differ -- cgit v1.2.1