summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMartin Pitt <martin@piware.de>2017-02-12 22:39:21 +0100
committerMartin Pitt <martin@piware.de>2017-02-13 22:23:48 +0100
commitee3c7ff7c303cdbc8fea18d3a6f3c4c6e7c450d8 (patch)
treebfd5463fe7e3ff5bd0c4bc607b36f4cb32c29d2c /Makefile.am
parentae3251851aa64138f415567b0a0d0df143182803 (diff)
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.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am25
1 files changed, 12 insertions, 13 deletions
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 \