From ee3c7ff7c303cdbc8fea18d3a6f3c4c6e7c450d8 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sun, 12 Feb 2017 22:39:21 +0100 Subject: [PATCH] test: move resolved test data into test/ Moe test-resolve's test data from src/resolve/test-data to test/test-resolve/ to be consistent with test/test-{execute,path}/. This will make it easier to make the tests relocatable. --- Makefile.am | 25 +++++++++--------- src/resolve/test-dns-packet.c | 2 +- .../_443._tcp.fedoraproject.org.pkts | Bin .../_openpgpkey.fedoraproject.org.pkts | Bin .../test-resolve}/fake-caa.pkts | Bin .../test-resolve}/fedoraproject.org.pkts | Bin .../test-resolve}/gandi.net.pkts | Bin .../test-resolve}/google.com.pkts | Bin .../test-resolve}/kyhwana.org.pkts | Bin .../test-data => test/test-resolve}/root.pkts | Bin ...aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts | Bin .../test-resolve}/teamits.com.pkts | Bin .../zbyszek@fedoraproject.org.pkts | Bin 13 files changed, 13 insertions(+), 14 deletions(-) rename {src/resolve/test-data => test/test-resolve}/_443._tcp.fedoraproject.org.pkts (100%) rename {src/resolve/test-data => test/test-resolve}/_openpgpkey.fedoraproject.org.pkts (100%) rename {src/resolve/test-data => test/test-resolve}/fake-caa.pkts (100%) rename {src/resolve/test-data => test/test-resolve}/fedoraproject.org.pkts (100%) rename {src/resolve/test-data => test/test-resolve}/gandi.net.pkts (100%) rename {src/resolve/test-data => test/test-resolve}/google.com.pkts (100%) rename {src/resolve/test-data => test/test-resolve}/kyhwana.org.pkts (100%) rename {src/resolve/test-data => test/test-resolve}/root.pkts (100%) rename {src/resolve/test-data => test/test-resolve}/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts (100%) rename {src/resolve/test-data => test/test-resolve}/teamits.com.pkts (100%) rename {src/resolve/test-data => test/test-resolve}/zbyszek@fedoraproject.org.pkts (100%) diff --git a/Makefile.am b/Makefile.am index 77e5aa7402..3c20c9d4bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5637,8 +5637,7 @@ test_dns_packet_SOURCES = \ $(basic_dns_sources) test_dns_packet_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\" + $(AM_CPPFLAGS) test_dns_packet_CFLAGS = \ $(AM_CFLAGS) \ @@ -5650,17 +5649,17 @@ test_dns_packet_LDADD = \ -lm 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/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 test_dnssec_SOURCES = \ src/resolve/test-dnssec.c \ diff --git a/src/resolve/test-dns-packet.c b/src/resolve/test-dns-packet.c index 956b155872..957b8677ba 100644 --- a/src/resolve/test-dns-packet.c +++ b/src/resolve/test-dns-packet.c @@ -115,7 +115,7 @@ int main(int argc, char **argv) { N = argc - 1; fnames = argv + 1; } else { - assert_se(glob(RESOLVE_TEST_DIR "/*.pkts", GLOB_NOSORT, NULL, &g) == 0); + assert_se(glob(TEST_DIR "/test-resolve/*.pkts", GLOB_NOSORT, NULL, &g) == 0); N = g.gl_pathc; fnames = g.gl_pathv; } diff --git a/src/resolve/test-data/_443._tcp.fedoraproject.org.pkts b/test/test-resolve/_443._tcp.fedoraproject.org.pkts similarity index 100% rename from src/resolve/test-data/_443._tcp.fedoraproject.org.pkts rename to test/test-resolve/_443._tcp.fedoraproject.org.pkts diff --git a/src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts b/test/test-resolve/_openpgpkey.fedoraproject.org.pkts similarity index 100% rename from src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts rename to test/test-resolve/_openpgpkey.fedoraproject.org.pkts diff --git a/src/resolve/test-data/fake-caa.pkts b/test/test-resolve/fake-caa.pkts similarity index 100% rename from src/resolve/test-data/fake-caa.pkts rename to test/test-resolve/fake-caa.pkts diff --git a/src/resolve/test-data/fedoraproject.org.pkts b/test/test-resolve/fedoraproject.org.pkts similarity index 100% rename from src/resolve/test-data/fedoraproject.org.pkts rename to test/test-resolve/fedoraproject.org.pkts diff --git a/src/resolve/test-data/gandi.net.pkts b/test/test-resolve/gandi.net.pkts similarity index 100% rename from src/resolve/test-data/gandi.net.pkts rename to test/test-resolve/gandi.net.pkts diff --git a/src/resolve/test-data/google.com.pkts b/test/test-resolve/google.com.pkts similarity index 100% rename from src/resolve/test-data/google.com.pkts rename to test/test-resolve/google.com.pkts diff --git a/src/resolve/test-data/kyhwana.org.pkts b/test/test-resolve/kyhwana.org.pkts similarity index 100% rename from src/resolve/test-data/kyhwana.org.pkts rename to test/test-resolve/kyhwana.org.pkts diff --git a/src/resolve/test-data/root.pkts b/test/test-resolve/root.pkts similarity index 100% rename from src/resolve/test-data/root.pkts rename to test/test-resolve/root.pkts diff --git a/src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts b/test/test-resolve/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts similarity index 100% rename from src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts rename to test/test-resolve/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts diff --git a/src/resolve/test-data/teamits.com.pkts b/test/test-resolve/teamits.com.pkts similarity index 100% rename from src/resolve/test-data/teamits.com.pkts rename to test/test-resolve/teamits.com.pkts diff --git a/src/resolve/test-data/zbyszek@fedoraproject.org.pkts b/test/test-resolve/zbyszek@fedoraproject.org.pkts similarity index 100% rename from src/resolve/test-data/zbyszek@fedoraproject.org.pkts rename to test/test-resolve/zbyszek@fedoraproject.org.pkts