Move resconf_test.c to tests/dns and cleanup

diff --git a/configure.ac b/configure.ac
index caad12ef021740e85bdba3e4c693323e434dfdde..4ac7264ab41d2cc322d6bbb4903a8c4bbac51c4b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1437,7 +1437,6 @@ AC_CONFIG_FILES([tests/Makefile
                 tests/isc/Makefile
                 tests/dns/Makefile
                 tests/ns/Makefile
-                tests/irs/Makefile
                 tests/isccfg/Makefile
                 tests/libtest/Makefile])
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9e27f39289578903ab80c9db8357effb63eaf30d..c9240727ba6d9b4e72a6f6cffa56ed7c39a6ca32 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,7 @@ LDADD +=                      \
 SUBDIRS = libtest
 
 if HAVE_CMOCKA
-SUBDIRS += isc dns ns isccfg irs bench
+SUBDIRS += isc dns ns isccfg bench
 endif HAVE_CMOCKA
 
 check_PROGRAMS =

diff --git a/tests/dns/Makefile.am b/tests/dns/Makefile.am
index 8d33cc46f349f60a52f6e59b61b6d6acf857f7c1..0eb30dcabf478c0c16585d3419420acb4dee8f17 100644 (file)
--- a/tests/dns/Makefile.am
+++ b/tests/dns/Makefile.am
@@ -42,6 +42,7 @@ check_PROGRAMS =              \
        rdata_test              \
        rdataset_test           \
        rdatasetstats_test      \
+       resconf_test            \
        resolver_test           \
        rsa_test                \
        sigs_test               \

diff --git a/tests/irs/resconf_test.c b/tests/dns/resconf_test.c
similarity index 68%
rename from tests/irs/resconf_test.c
rename to tests/dns/resconf_test.c
index f9d22d9d34761916828c43cb19e613b15ae0f2fd..dae666a6a5aa4aec61ebe59b061dc3e2551869ae 100644 (file)
--- a/tests/irs/resconf_test.c
+++ b/tests/dns/resconf_test.c
@@ -122,44 +122,46 @@ ISC_RUN_TEST_IMPL(irs_resconf_load) {
                isc_result_t loadres;
                isc_result_t (*check)(irs_resconf_t *resconf);
                isc_result_t checkres;
-       } tests[] = {
-               { "testdata/domain.conf", ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
-               { "testdata/nameserver-v4.conf", ISC_R_SUCCESS, check_ns4,
-                 ISC_R_SUCCESS },
-               { "testdata/nameserver-v6.conf", ISC_R_SUCCESS, check_ns6,
-                 ISC_R_SUCCESS },
-               { "testdata/nameserver-v6-scoped.conf", ISC_R_SUCCESS,
-                 check_scoped, ISC_R_SUCCESS },
-               { "testdata/options-attempts.conf", ISC_R_SUCCESS,
-                 check_attempts, ISC_R_SUCCESS },
-               { "testdata/options-debug.conf", ISC_R_SUCCESS, NULL,
-                 ISC_R_SUCCESS },
-               { "testdata/options-ndots.conf", ISC_R_SUCCESS, check_ndots,
-                 ISC_R_SUCCESS },
-               { "testdata/options-timeout.conf", ISC_R_SUCCESS, check_timeout,
-                 ISC_R_SUCCESS },
-               { "testdata/options-unknown.conf", ISC_R_SUCCESS, NULL,
-                 ISC_R_SUCCESS },
-               { "testdata/options.conf", ISC_R_SUCCESS, check_options,
-                 ISC_R_SUCCESS },
-               { "testdata/options-bad-ndots.conf", ISC_R_RANGE, NULL,
-                 ISC_R_SUCCESS },
-               { "testdata/options-empty.conf", ISC_R_UNEXPECTEDEND, NULL,
-                 ISC_R_SUCCESS },
-               { "testdata/port.conf", ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
-               { "testdata/resolv.conf", ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
-               { "testdata/search.conf", ISC_R_SUCCESS, search_example,
-                 ISC_R_SUCCESS },
-               { "testdata/sortlist-v4.conf", ISC_R_SUCCESS, NULL,
-                 ISC_R_SUCCESS },
-               { "testdata/timeout.conf", ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
-               { "testdata/unknown-with-value.conf", ISC_R_SUCCESS, NULL,
-                 ISC_R_SUCCESS },
-               { "testdata/unknown-without-value.conf", ISC_R_SUCCESS, NULL,
-                 ISC_R_SUCCESS },
-               { "testdata/unknown+search.conf", ISC_R_SUCCESS, search_example,
-                 ISC_R_SUCCESS }
-       };
+       } tests[] = { { "testdata/resconf/domain.conf", ISC_R_SUCCESS, NULL,
+                       ISC_R_SUCCESS },
+                     { "testdata/resconf/nameserver-v4.conf", ISC_R_SUCCESS,
+                       check_ns4, ISC_R_SUCCESS },
+                     { "testdata/resconf/nameserver-v6.conf", ISC_R_SUCCESS,
+                       check_ns6, ISC_R_SUCCESS },
+                     { "testdata/resconf/nameserver-v6-scoped.conf",
+                       ISC_R_SUCCESS, check_scoped, ISC_R_SUCCESS },
+                     { "testdata/resconf/options-attempts.conf", ISC_R_SUCCESS,
+                       check_attempts, ISC_R_SUCCESS },
+                     { "testdata/resconf/options-debug.conf", ISC_R_SUCCESS,
+                       NULL, ISC_R_SUCCESS },
+                     { "testdata/resconf/options-ndots.conf", ISC_R_SUCCESS,
+                       check_ndots, ISC_R_SUCCESS },
+                     { "testdata/resconf/options-timeout.conf", ISC_R_SUCCESS,
+                       check_timeout, ISC_R_SUCCESS },
+                     { "testdata/resconf/options-unknown.conf", ISC_R_SUCCESS,
+                       NULL, ISC_R_SUCCESS },
+                     { "testdata/resconf/options.conf", ISC_R_SUCCESS,
+                       check_options, ISC_R_SUCCESS },
+                     { "testdata/resconf/options-bad-ndots.conf", ISC_R_RANGE,
+                       NULL, ISC_R_SUCCESS },
+                     { "testdata/resconf/options-empty.conf",
+                       ISC_R_UNEXPECTEDEND, NULL, ISC_R_SUCCESS },
+                     { "testdata/resconf/port.conf", ISC_R_SUCCESS, NULL,
+                       ISC_R_SUCCESS },
+                     { "testdata/resconf/resolv.conf", ISC_R_SUCCESS, NULL,
+                       ISC_R_SUCCESS },
+                     { "testdata/resconf/search.conf", ISC_R_SUCCESS,
+                       search_example, ISC_R_SUCCESS },
+                     { "testdata/resconf/sortlist-v4.conf", ISC_R_SUCCESS,
+                       NULL, ISC_R_SUCCESS },
+                     { "testdata/resconf/timeout.conf", ISC_R_SUCCESS, NULL,
+                       ISC_R_SUCCESS },
+                     { "testdata/resconf/unknown-with-value.conf",
+                       ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
+                     { "testdata/resconf/unknown-without-value.conf",
+                       ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
+                     { "testdata/resconf/unknown+search.conf", ISC_R_SUCCESS,
+                       search_example, ISC_R_SUCCESS } };
 
        UNUSED(state);
 

diff --git a/tests/irs/testdata/domain.conf b/tests/dns/testdata/resconf/domain.conf
similarity index 100%
rename from tests/irs/testdata/domain.conf
rename to tests/dns/testdata/resconf/domain.conf

diff --git a/tests/irs/testdata/nameserver-v4.conf b/tests/dns/testdata/resconf/nameserver-v4.conf
similarity index 100%
rename from tests/irs/testdata/nameserver-v4.conf
rename to tests/dns/testdata/resconf/nameserver-v4.conf

diff --git a/tests/irs/testdata/nameserver-v6-scoped.conf b/tests/dns/testdata/resconf/nameserver-v6-scoped.conf
similarity index 100%
rename from tests/irs/testdata/nameserver-v6-scoped.conf
rename to tests/dns/testdata/resconf/nameserver-v6-scoped.conf

diff --git a/tests/irs/testdata/nameserver-v6.conf b/tests/dns/testdata/resconf/nameserver-v6.conf
similarity index 100%
rename from tests/irs/testdata/nameserver-v6.conf
rename to tests/dns/testdata/resconf/nameserver-v6.conf

diff --git a/tests/irs/testdata/options-attempts.conf b/tests/dns/testdata/resconf/options-attempts.conf
similarity index 100%
rename from tests/irs/testdata/options-attempts.conf
rename to tests/dns/testdata/resconf/options-attempts.conf

diff --git a/tests/irs/testdata/options-bad-ndots.conf b/tests/dns/testdata/resconf/options-bad-ndots.conf
similarity index 100%
rename from tests/irs/testdata/options-bad-ndots.conf
rename to tests/dns/testdata/resconf/options-bad-ndots.conf

diff --git a/tests/irs/testdata/options-debug.conf b/tests/dns/testdata/resconf/options-debug.conf
similarity index 100%
rename from tests/irs/testdata/options-debug.conf
rename to tests/dns/testdata/resconf/options-debug.conf

diff --git a/tests/irs/testdata/options-empty.conf b/tests/dns/testdata/resconf/options-empty.conf
similarity index 100%
rename from tests/irs/testdata/options-empty.conf
rename to tests/dns/testdata/resconf/options-empty.conf

diff --git a/tests/irs/testdata/options-ndots.conf b/tests/dns/testdata/resconf/options-ndots.conf
similarity index 100%
rename from tests/irs/testdata/options-ndots.conf
rename to tests/dns/testdata/resconf/options-ndots.conf

diff --git a/tests/irs/testdata/options-timeout.conf b/tests/dns/testdata/resconf/options-timeout.conf
similarity index 100%
rename from tests/irs/testdata/options-timeout.conf
rename to tests/dns/testdata/resconf/options-timeout.conf

diff --git a/tests/irs/testdata/options-unknown.conf b/tests/dns/testdata/resconf/options-unknown.conf
similarity index 100%
rename from tests/irs/testdata/options-unknown.conf
rename to tests/dns/testdata/resconf/options-unknown.conf

diff --git a/tests/irs/testdata/options.conf b/tests/dns/testdata/resconf/options.conf
similarity index 100%
rename from tests/irs/testdata/options.conf
rename to tests/dns/testdata/resconf/options.conf

diff --git a/tests/irs/testdata/port.conf b/tests/dns/testdata/resconf/port.conf
similarity index 100%
rename from tests/irs/testdata/port.conf
rename to tests/dns/testdata/resconf/port.conf

diff --git a/tests/irs/testdata/resolv.conf b/tests/dns/testdata/resconf/resolv.conf
similarity index 100%
rename from tests/irs/testdata/resolv.conf
rename to tests/dns/testdata/resconf/resolv.conf

diff --git a/tests/irs/testdata/search.conf b/tests/dns/testdata/resconf/search.conf
similarity index 100%
rename from tests/irs/testdata/search.conf
rename to tests/dns/testdata/resconf/search.conf

diff --git a/tests/irs/testdata/sortlist-v4.conf b/tests/dns/testdata/resconf/sortlist-v4.conf
similarity index 100%
rename from tests/irs/testdata/sortlist-v4.conf
rename to tests/dns/testdata/resconf/sortlist-v4.conf

diff --git a/tests/irs/testdata/timeout.conf b/tests/dns/testdata/resconf/timeout.conf
similarity index 100%
rename from tests/irs/testdata/timeout.conf
rename to tests/dns/testdata/resconf/timeout.conf

diff --git a/tests/irs/testdata/unknown+search.conf b/tests/dns/testdata/resconf/unknown+search.conf
similarity index 100%
rename from tests/irs/testdata/unknown+search.conf
rename to tests/dns/testdata/resconf/unknown+search.conf

diff --git a/tests/irs/testdata/unknown-with-value.conf b/tests/dns/testdata/resconf/unknown-with-value.conf
similarity index 100%
rename from tests/irs/testdata/unknown-with-value.conf
rename to tests/dns/testdata/resconf/unknown-with-value.conf

diff --git a/tests/irs/testdata/unknown-without-value.conf b/tests/dns/testdata/resconf/unknown-without-value.conf
similarity index 100%
rename from tests/irs/testdata/unknown-without-value.conf
rename to tests/dns/testdata/resconf/unknown-without-value.conf

diff --git a/tests/irs/Makefile.am b/tests/irs/Makefile.am
deleted file mode 100644 (file)
index 5bf0846..0000000
--- a/tests/irs/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-include $(top_srcdir)/Makefile.top
-
-AM_CPPFLAGS +=                 \
-       $(LIBISC_CFLAGS)        \
-       $(LIBDNS_CFLAGS)
-
-LDADD +=                       \
-       $(LIBISC_LIBS)          \
-       $(LIBDNS_LIBS)
-
-check_PROGRAMS =               \
-       resconf_test
-
-EXTRA_DIST = testdata
-
-include $(top_srcdir)/Makefile.tests