move samples/resolve.c to bin/tests/system

"resolve" is used by the resolver system tests, and I'm not
certain whether delv exercises the same code, so rather than
remove it, I moved it to bin/tests/system.

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index bce2fb13e3e0bfded5b5df00c4a3f4429c5e220d..4ef54205a1fdd22b6a79e71231263b2103a26f54 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -23,6 +23,7 @@ check_PROGRAMS =              \
        feature-test            \
        makejournal             \
        pipelined/pipequeries   \
+       resolve                 \
        rndc/gencheck           \
        rpz/dnsrps              \
        tkey/keycreate          \
@@ -48,6 +49,14 @@ pipelined_pipequeries_LDADD =        \
        $(LDADD)                \
        $(LIBDNS_LIBS)
 
+resolve_CPPFLAGS =             \
+       $(AM_CPPFLAGS)          \
+       $(LIBISC_CFLAGS)        \
+       $(LIBDNS_CFLAGS)        \
+       $(LIBIRS_CFLAGS)
+
+resolve_LDADD = $(LIBISC_LIBS) $(LIBIRS_LIBS) $(LIBDNS_LIBS)
+
 tkey_keycreate_CPPFLAGS =      \
        $(AM_CPPFLAGS)          \
        $(LIBDNS_CFLAGS)

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 08983b65f8b3159ff1b67105d2338fabe76738a7..9f4524b708abd73ef5112800029e07f30fbd643e 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -51,7 +51,7 @@ NZD2NZF=$TOP_BUILDDIR/bin/tools/named-nzd2nzf
 PK11DEL="$TOP_BUILDDIR/bin/pkcs11/pkcs11-destroy -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0"
 PK11GEN="$TOP_BUILDDIR/bin/pkcs11/pkcs11-keygen -q -s ${SLOT:-0} -p ${HSMPIN:-1234}"
 PK11LIST="$TOP_BUILDDIR/bin/pkcs11/pkcs11-list -s ${SLOT:-0} -p ${HSMPIN:-1234}"
-RESOLVE=$TOP_BUILDDIR/lib/samples/resolve
+RESOLVE=$TOP_BUILDDIR/bin/tests/system/resolve
 REVOKE=$TOP_BUILDDIR/bin/dnssec/dnssec-revoke
 RNDC=$TOP_BUILDDIR/bin/rndc/rndc
 RNDCCONFGEN=$TOP_BUILDDIR/bin/confgen/rndc-confgen

diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
index ca410631098d39c51373214b6ae27d03901b9f95..bdebe0885c9c08aabc9e86336e646abe59631706 100644 (file)
--- a/bin/tests/system/conf.sh.win32
+++ b/bin/tests/system/conf.sh.win32
@@ -51,7 +51,6 @@ NZD2NZF=$TOP_BUILDDIR/Build/$VSCONF/named-nzd2nzf@EXEEXT@
 PK11DEL="$TOP_BUILDDIR/Build/$VSCONF/pkcs11-destroy@EXEEXT@ -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0"
 PK11GEN="$TOP_BUILDDIR/Build/$VSCONF/pkcs11-keygen@EXEEXT@ -q -s ${SLOT:-0} -p ${HSMPIN:-1234}"
 PK11LIST="$TOP_BUILDDIR/Build/$VSCONF/pkcs11-list@EXEEXT@ -s ${SLOT:-0} -p ${HSMPIN:-1234}"
-RESOLVE=$TOP_BUILDDIR/lib/samples/resolve
 REVOKE=$TOP_BUILDDIR/Build/$VSCONF/dnssec-revoke@EXEEXT@
 RNDC=$TOP_BUILDDIR/Build/$VSCONF/rndc@EXEEXT@
 RNDCCONFGEN=$TOP_BUILDDIR/Build/$VSCONF/rndc-confgen@EXEEXT@
@@ -70,6 +69,7 @@ KEYCREATE=$TOP_BUILDDIR/Build/$VSCONF/keycreate@EXEEXT@
 KEYDELETE=$TOP_BUILDDIR/Build/$VSCONF/keydelete@EXEEXT@
 MAKEJOURNAL=$TOP_BUILDDIR/Build/$VSCONF/makejournal@EXEEXT@
 PIPEQUERIES=$TOP_BUILDDIR/Build/$VSCONF/pipequeries@EXEEXT@
+RESOLVE=$TOP_BUILDDIR/Build/$VSCONF/resolve@EXEEXT@
 
 # we don't want a KRB5_CONFIG setting breaking the tests
 KRB5_CONFIG=NUL

diff --git a/lib/samples/resolve.c b/bin/tests/system/resolve.c
similarity index 100%
rename from lib/samples/resolve.c
rename to bin/tests/system/resolve.c

diff --git a/lib/samples/win32/resolve.vcxproj.filters.in b/bin/tests/system/win32/resolve.vcxproj.filters.in
similarity index 100%
rename from lib/samples/win32/resolve.vcxproj.filters.in
rename to bin/tests/system/win32/resolve.vcxproj.filters.in

diff --git a/lib/samples/win32/resolve.vcxproj.in b/bin/tests/system/win32/resolve.vcxproj.in
similarity index 100%
rename from lib/samples/win32/resolve.vcxproj.in
rename to bin/tests/system/win32/resolve.vcxproj.in

diff --git a/lib/samples/win32/resolve.vcxproj.user b/bin/tests/system/win32/resolve.vcxproj.user
similarity index 100%
rename from lib/samples/win32/resolve.vcxproj.user
rename to bin/tests/system/win32/resolve.vcxproj.user

diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.in
index f4415ad15903970fef9c57a0552c1f9290f560cd..18f783ecbd7a255efed6a6cf425e8b1a17f05430 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstall.vcxproj.in
+++ b/bin/win32/BINDInstall/BINDInstall.vcxproj.in
@@ -258,6 +258,9 @@
     <ProjectReference Include="..\..\..\bin\tests\system\win32\pipequeries.vcxproj">
       <Project>{E1478F40-786C-4738-8E99-E7A71DD98661}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\tests\samples\win32\resolve.vcxproj">
+      <Project>{F66D8B7E-721D-4602-99AD-820D19AD1313}</Project>
+    </ProjectReference>
 @END STESTS
     <ProjectReference Include="..\..\..\bin\tools\win32\arpaname.vcxproj">
       <Project>{91E60FDA-E48C-4DA0-92A2-97F963348E00}</Project>
@@ -298,11 +301,6 @@
     <ProjectReference Include="..\..\..\lib\ns\win32\libns.vcxproj">
       <Project>{82ACD33C-E75F-45B8-BB6D-42643A10D7EE}</Project>
     </ProjectReference>
-@IF SAMPLES
-    <ProjectReference Include="..\..\..\lib\samples\win32\resolve.vcxproj">
-      <Project>{F66D8B7E-721D-4602-99AD-820D19AD1313}</Project>
-    </ProjectReference>
-@END SAMPLES
     <ProjectReference Include="..\..\..\lib\win32\bindevt\bindevt.vcxproj">
       <Project>{0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}</Project>
     </ProjectReference>

diff --git a/configure.ac b/configure.ac
index c05600872fdd7290bb03f6afafe9415dd6de8edb..48fa826bae4604c1e58eccbc48ce7098884fca5f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1616,8 +1616,7 @@ AC_CONFIG_FILES([lib/Makefile
                 lib/irs/Makefile
                 lib/isccfg/Makefile
                 lib/isccc/Makefile
-                lib/bind9/Makefile
-                lib/samples/Makefile])
+                lib/bind9/Makefile])
 
 # Documentation
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5cbaf3c8954bcec9fa10b646a5e9c59a3684cf16..39741a427fbd6ade4a0b3707ba820e2deb749855 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,3 +1,3 @@
 include $(top_srcdir)/Makefile.top
 
-SUBDIRS = isc dns isccc ns isccfg bind9 irs samples
+SUBDIRS = isc dns isccc ns isccfg bind9 irs

diff --git a/lib/samples/.gitignore b/lib/samples/.gitignore
deleted file mode 100644 (file)
index 0cc4fa4..0000000
--- a/lib/samples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-resolve

diff --git a/lib/samples/Makefile.am b/lib/samples/Makefile.am
deleted file mode 100644 (file)
index 83183b5..0000000
--- a/lib/samples/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-include $(top_srcdir)/Makefile.top
-
-AM_CPPFLAGS +=                 \
-       $(LIBISC_CFLAGS)        \
-       $(LIBDNS_CFLAGS)        \
-       $(LIBIRS_CFLAGS)
-
-noinst_PROGRAMS =              \
-       resolve
-
-resolve_SOURCES = resolve.c
-resolve_LDADD = $(LIBISC_LIBS) $(LIBIRS_LIBS) $(LIBDNS_LIBS)

diff --git a/util/copyrights b/util/copyrights
index 44e00db6c67a9ffa60a1e575062a619f5c6293d9..c69312fe83a481d41d0fca91870bc20ff4b15951 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -710,6 +710,7 @@
 ./bin/tests/system/redirect/ns5/sign.sh                SH      2019,2020,2021
 ./bin/tests/system/redirect/setup.sh           SH      2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
 ./bin/tests/system/redirect/tests.sh           SH      2011,2012,2013,2014,2015,2016,2018,2019,2020,2021
+./bin/tests/system/resolve.c                   C       2009,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
 ./bin/tests/system/resolver/ans2/ans.pl                PERL    2019,2020,2021
 ./bin/tests/system/resolver/ans3/ans.pl                PERL    2000,2001,2004,2007,2009,2012,2016,2018,2019,2020,2021
 ./bin/tests/system/resolver/ans8/ans.pl                PERL    2017,2018,2019,2020,2021
@@ -983,6 +984,9 @@
 ./bin/tests/system/win32/pipequeries.vcxproj.filters.in        X       2016,2018,2019,2020
 ./bin/tests/system/win32/pipequeries.vcxproj.in        X       2016,2017,2018,2019,2020
 ./bin/tests/system/win32/pipequeries.vcxproj.user      X       2016,2018,2019,2020,2021
+./bin/tests/system/win32/resolve.vcxproj.filters.in    X       2014,2015,2018,2019,2020
+./bin/tests/system/win32/resolve.vcxproj.in    X       2014,2015,2016,2017,2018,2019,2020
+./bin/tests/system/win32/resolve.vcxproj.user  X       2014,2018,2019,2020,2021
 ./bin/tests/system/xfer/ans5/badkeydata                X       2011,2018,2019,2020,2021
 ./bin/tests/system/xfer/ans5/badmessageid      X       2020,2021
 ./bin/tests/system/xfer/ans5/goodaxfr          X       2011,2018,2019,2020,2021
@@ -2189,10 +2193,6 @@
 ./lib/ns/win32/libns.vcxproj.in                        X       2017,2018,2019,2020
 ./lib/ns/win32/libns.vcxproj.user              X       2017,2018,2019,2020,2021
 ./lib/ns/xfrout.c                              C       2017,2018,2019,2020,2021
-./lib/samples/resolve.c                                C       2009,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
-./lib/samples/win32/resolve.vcxproj.filters.in X       2014,2015,2018,2019,2020
-./lib/samples/win32/resolve.vcxproj.in         X       2014,2015,2016,2017,2018,2019,2020
-./lib/samples/win32/resolve.vcxproj.user       X       2014,2018,2019,2020,2021
 ./lib/win32/bindevt/bindevt.c                  C       2000,2001,2004,2007,2016,2018,2019,2020,2021
 ./lib/win32/bindevt/bindevt.mc                 X       2001,2004,2007,2016,2018,2019,2020,2021
 ./lib/win32/bindevt/bindevt.vcxproj.filters.in X       2013,2015,2018,2019,2020

diff --git a/win32utils/Configure b/win32utils/Configure
index 29a96a45451c7a1eaa017b5eab0cc988df68b66c..c5870ea78aa0edbac2585564acba60b0bf3c914e 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -112,6 +112,8 @@ my @projectlist = ("../bin/check/win32/checkconf.vcxproj",
                    "../bin/tests/system/win32/pipequeries.vcxproj.filters",
                    "../bin/tests/system/win32/makejournal.vcxproj",
                    "../bin/tests/system/win32/makejournal.vcxproj.filters",
+                   "../bin/tests/system/win32/resolve.vcxproj",
+                   "../bin/tests/system/win32/resolve.vcxproj.filters",
                    "../bin/win32/BINDInstall/BINDInstall.vcxproj",
                    "../bin/win32/BINDInstall/BINDInstall.vcxproj.filters",
                    "../lib/bind9/win32/libbind9.vcxproj",
@@ -129,8 +131,6 @@ my @projectlist = ("../bin/check/win32/checkconf.vcxproj",
                    "../lib/isccfg/win32/libisccfg.vcxproj",
                    "../lib/isccfg/win32/libisccfg.vcxproj.filters",
                    "../lib/ns/win32/libns.vcxproj",
-                   "../lib/samples/win32/resolve.vcxproj",
-                   "../lib/samples/win32/resolve.vcxproj.filters",
                    "../lib/win32/bindevt/bindevt.vcxproj",
                    "../lib/win32/bindevt/bindevt.vcxproj.filters",
                    "bind9.sln");
@@ -300,7 +300,6 @@ my @substcond = ("ATOMIC",
                  "OPENSSL",
                  "PKCS11",
                  "PYTHON",
-                 "SAMPLES",
                  "STESTS",
                  "TESTS",
                  "ZLIB");
@@ -341,7 +340,6 @@ my @withlist = ("aes",
                 "pssuspend",
                 "python",
                 "readline",
-                "samples",
                 "system-tests",
                 "tests",
                 "tuning",
@@ -382,7 +380,6 @@ my @help = (
 "  with-tests            build with test suite\n",
 "  with-extra-tests      build with extra test suite\n",
 "  with-system-tests     build with system test suite\n",
-"  with-samples          build with sample programs\n",
 "  with-openssl[=PATH]   build with OpenSSL yes|path (mandatory)\n",
 "  with-libuv[=PATH]     build with libuv yes|path (mandatory)\n",
 "  with-nghttp2[=PATH]   build with nghttp2 yes|path (mandatory)\n",
@@ -425,7 +422,6 @@ my $enable_rpz_nsip = "yes";
 my $enable_rpz_nsdname = "yes";
 my $use_tests = "no";
 my $use_stests = "no";
-my $use_samples = "no";
 my $use_libuv = "auto";
 my $libuv_path = "../../";
 my $nghttp2_path = "../../";
@@ -717,7 +713,6 @@ if ($enable_developer eq "yes") {
     # TODO: dlz filesystem
     $use_tests = "yes";
     $use_stests = "yes";
-    $use_samples = "yes";
 }
 
 # parse with/without
@@ -739,10 +734,6 @@ sub mywith {
             $use_tests = "yes";
             $use_stests = "yes";
         }
-    } elsif ($key =~ /^samples$/i) {
-        if ($val =~ /^yes$/i) {
-            $use_samples = "yes";
-        }
     } elsif ($key =~ /^openssl$/i) {
         if ($val =~ /^no$/i) {
             die "OpenSSL support is now mandatory\n";
@@ -963,9 +954,6 @@ if ($verbose) {
     if ($use_stests eq "yes") {
         print "system tests: enabled\n";
     }
-    if ($use_samples eq "yes") {
-        print "sample programs: enabled\n";
-    }
     if ($use_pkcs11 eq "no") {
         print "pkcs11: disabled\n";
     } else {
@@ -1257,11 +1245,6 @@ if ($use_stests eq "yes") {
     $configcond{"STESTS"} = 1;
 }
 
-# with-samples
-if ($use_samples eq "yes") {
-    $configcond{"SAMPLES"} = 1;
-}
-
 # with-libuv
 if ($use_libuv eq "auto") {
     if ($verbose) {

diff --git a/win32utils/bind9.sln.in b/win32utils/bind9.sln.in
index fc3ad843c72a5b4b1ced437b4f5f4070aa010d81..60c4db82cce46189b069f689b468c49b07523dc4 100644 (file)
--- a/win32utils/bind9.sln.in
+++ b/win32utils/bind9.sln.in
@@ -22,10 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libirs", "..\lib\irs\win32\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bindevt", "..\lib\win32\bindevt\bindevt.vcxproj", "{0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}"
 EndProject
-@IF SAMPLES
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resolve", "..\lib\samples\win32\resolve.vcxproj", "{F66D8B7E-721D-4602-99AD-820D19AD1313}"
-EndProject
-@END SAMPLES
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "named", "..\bin\named\win32\named.vcxproj", "{723C65DA-A96C-4BA3-A34E-44F11CA346F9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rndc", "..\bin\rndc\win32\rndc.vcxproj", "{39721F26-8B80-4AA9-9826-2AEF7322C3D5}"
@@ -97,6 +93,8 @@ EndProject
 @IF STESTS
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makejournal", "..\bin\tests\system\win32\makejournal.vcxproj", "{31715139-2C27-47D2-8394-71B71A8AC3D5}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resolve", "..\bin\tests\system\win32\resolve.vcxproj", "{F66D8B7E-721D-4602-99AD-820D19AD1313}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencheck", "..\bin\tests\system\win32\gencheck.vcxproj", "{764DBE24-C8B3-46E8-BE73-196431353A5D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bigkey", "..\bin\tests\system\win32\bigkey.vcxproj", "{61F9D673-EB5C-47A5-8907-24E034C75EF8}"
@@ -156,32 +154,6 @@ Global
                {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@
                {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@
                {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@
-@IF SAMPLES
-               {F66D8B7E-721D-4602-99AD-820D19AD1313}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@
-               {F66D8B7E-721D-4602-99AD-820D19AD1313}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@
-               {F66D8B7E-721D-4602-99AD-820D19AD1313}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@
-               {F66D8B7E-721D-4602-99AD-820D19AD1313}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@
-               {9FC33CA3-CE4A-4EDF-BA99-EECA4B81AD06}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@
-               {9FC33CA3-CE4A-4EDF-BA99-EECA4B81AD06}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@
-               {9FC33CA3-CE4A-4EDF-BA99-EECA4B81AD06}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@
-               {9FC33CA3-CE4A-4EDF-BA99-EECA4B81AD06}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@
-               {D42B8670-8DF6-4D90-90F7-DB5FB845AFAE}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@
-               {D42B8670-8DF6-4D90-90F7-DB5FB845AFAE}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@
-               {D42B8670-8DF6-4D90-90F7-DB5FB845AFAE}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@
-               {D42B8670-8DF6-4D90-90F7-DB5FB845AFAE}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@
-               {05682E12-523F-4DAE-8E6D-ADFDBC308AFD}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@
-               {05682E12-523F-4DAE-8E6D-ADFDBC308AFD}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@
-               {05682E12-523F-4DAE-8E6D-ADFDBC308AFD}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@
-               {05682E12-523F-4DAE-8E6D-ADFDBC308AFD}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@
-               {FF440E85-7450-439C-82EE-04C464512D0E}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@
-               {FF440E85-7450-439C-82EE-04C464512D0E}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@
-               {FF440E85-7450-439C-82EE-04C464512D0E}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@
-               {FF440E85-7450-439C-82EE-04C464512D0E}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@
-               {CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@
-               {CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@
-               {CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@
-               {CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@
-@END SAMPLES
                {723C65DA-A96C-4BA3-A34E-44F11CA346F9}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@
                {723C65DA-A96C-4BA3-A34E-44F11CA346F9}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@
                {723C65DA-A96C-4BA3-A34E-44F11CA346F9}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@