Move resconf_test.c to tests/dns and cleanup

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])
 

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 =

tests/dns/Makefile.am

@@ -42,6 +42,7 @@ check_PROGRAMS =		\
 	rdata_test		\
 	rdataset_test		\
 	rdatasetstats_test	\
+	resconf_test		\
 	resolver_test		\
 	rsa_test		\
 	sigs_test		\

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[] = {
+	} tests[] = { { "testdata/resconf/domain.conf", ISC_R_SUCCESS, NULL,
-		{ "testdata/domain.conf", ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
+			ISC_R_SUCCESS },
-		{ "testdata/nameserver-v4.conf", ISC_R_SUCCESS, check_ns4,
+		      { "testdata/resconf/nameserver-v4.conf", ISC_R_SUCCESS,
-		  ISC_R_SUCCESS },
+			check_ns4, ISC_R_SUCCESS },
-		{ "testdata/nameserver-v6.conf", ISC_R_SUCCESS, check_ns6,
+		      { "testdata/resconf/nameserver-v6.conf", ISC_R_SUCCESS,
-		  ISC_R_SUCCESS },
+			check_ns6, ISC_R_SUCCESS },
-		{ "testdata/nameserver-v6-scoped.conf", ISC_R_SUCCESS,
+		      { "testdata/resconf/nameserver-v6-scoped.conf",
-		  check_scoped, ISC_R_SUCCESS },
+			ISC_R_SUCCESS, check_scoped, ISC_R_SUCCESS },
-		{ "testdata/options-attempts.conf", ISC_R_SUCCESS,
+		      { "testdata/resconf/options-attempts.conf", ISC_R_SUCCESS,
-		  check_attempts, ISC_R_SUCCESS },
+			check_attempts, ISC_R_SUCCESS },
-		{ "testdata/options-debug.conf", ISC_R_SUCCESS, NULL,
+		      { "testdata/resconf/options-debug.conf", ISC_R_SUCCESS,
-		  ISC_R_SUCCESS },
+			NULL, ISC_R_SUCCESS },
-		{ "testdata/options-ndots.conf", ISC_R_SUCCESS, check_ndots,
+		      { "testdata/resconf/options-ndots.conf", ISC_R_SUCCESS,
-		  ISC_R_SUCCESS },
+			check_ndots, ISC_R_SUCCESS },
-		{ "testdata/options-timeout.conf", ISC_R_SUCCESS, check_timeout,
+		      { "testdata/resconf/options-timeout.conf", ISC_R_SUCCESS,
-		  ISC_R_SUCCESS },
+			check_timeout, ISC_R_SUCCESS },
-		{ "testdata/options-unknown.conf", ISC_R_SUCCESS, NULL,
+		      { "testdata/resconf/options-unknown.conf", ISC_R_SUCCESS,
-		  ISC_R_SUCCESS },
+			NULL, ISC_R_SUCCESS },
-		{ "testdata/options.conf", ISC_R_SUCCESS, check_options,
+		      { "testdata/resconf/options.conf", ISC_R_SUCCESS,
-		  ISC_R_SUCCESS },
+			check_options, ISC_R_SUCCESS },
-		{ "testdata/options-bad-ndots.conf", ISC_R_RANGE, NULL,
+		      { "testdata/resconf/options-bad-ndots.conf", ISC_R_RANGE,
-		  ISC_R_SUCCESS },
+			NULL, ISC_R_SUCCESS },
-		{ "testdata/options-empty.conf", ISC_R_UNEXPECTEDEND, NULL,
+		      { "testdata/resconf/options-empty.conf",
-		  ISC_R_SUCCESS },
+			ISC_R_UNEXPECTEDEND, NULL, ISC_R_SUCCESS },
-		{ "testdata/port.conf", ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
+		      { "testdata/resconf/port.conf", ISC_R_SUCCESS, NULL,
-		{ "testdata/resolv.conf", ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
+			ISC_R_SUCCESS },
-		{ "testdata/search.conf", ISC_R_SUCCESS, search_example,
+		      { "testdata/resconf/resolv.conf", ISC_R_SUCCESS, NULL,
-		  ISC_R_SUCCESS },
+			ISC_R_SUCCESS },
-		{ "testdata/sortlist-v4.conf", ISC_R_SUCCESS, NULL,
+		      { "testdata/resconf/search.conf", ISC_R_SUCCESS,
-		  ISC_R_SUCCESS },
+			search_example, ISC_R_SUCCESS },
-		{ "testdata/timeout.conf", ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
+		      { "testdata/resconf/sortlist-v4.conf", ISC_R_SUCCESS,
-		{ "testdata/unknown-with-value.conf", ISC_R_SUCCESS, NULL,
+			NULL, ISC_R_SUCCESS },
-		  ISC_R_SUCCESS },
+		      { "testdata/resconf/timeout.conf", ISC_R_SUCCESS, NULL,
-		{ "testdata/unknown-without-value.conf", ISC_R_SUCCESS, NULL,
+			ISC_R_SUCCESS },
-		  ISC_R_SUCCESS },
+		      { "testdata/resconf/unknown-with-value.conf",
-		{ "testdata/unknown+search.conf", ISC_R_SUCCESS, search_example,
+			ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
-		  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);
 

tests/irs/Makefile.am

@@ -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