updated building files

diff --git a/bin/tests/system/conf.sh.win.in b/bin/tests/system/conf.sh.win32.in
similarity index 62%
rename from bin/tests/system/conf.sh.win.in
rename to bin/tests/system/conf.sh.win32.in
index 3e2994f85ea55a4bdece7346c0c75227226d8624..ed4b642744dab77da26923ac526549045a9b4c7d 100644 (file)
--- a/bin/tests/system/conf.sh.win.in
+++ b/bin/tests/system/conf.sh.win32.in
@@ -17,42 +17,42 @@ TOP=${SYSTEMTESTTOP:=.}/../../..
 # Make it absolute so that it continues to work after we cd.
 TOP=`cd $TOP && pwd`
 
-NAMED=$TOP/build/debug/named.exe
+NAMED=$TOP/Build/Debug/named@EXEEXT@
 # We must use "named -l" instead of "lwresd" because argv[0] is lost
 # if the program is libtoolized.
-LWRESD="$TOP/build/debug/named.exe -l"
-DIG=$TOP/build/debug/dig.exe
-DELV=$TOP/build/debug/delv.exe
-RNDC=$TOP/build/debug/rndc.exe
-NSUPDATE=$TOP/build/debug/nsupdate.exe
-DDNSCONFGEN=$TOP/build/debug/ddns-confgen.exe
-TSIGKEYGEN=$TOP/build/debug/tsig-keygen.exe
-RNDCCONFGEN=$TOP/build/debug/rndc-confgen.exe
-KEYGEN=$TOP/build/debug/dnssec-keygen.exe
-KEYFRLAB=$TOP/build/debug/dnssec-keyfromlabel.exe
-SIGNER=$TOP/build/debug/dnssec-signzone.exe
-REVOKE=$TOP/build/debug/dnssec-revoke.exe
-SETTIME=$TOP/build/debug/dnssec-settime.exe
-DSFROMKEY=$TOP/build/debug/dnssec-dsfromkey.exe
-IMPORTKEY=$TOP/build/debug/dnssec-importkey.exe
-CHECKDS=$TOP/build/debug/dnssec-checkds.exe
-COVERAGE=$TOP/build/debug/dnssec-coverage.exe
-KEYMGR=$TOP/build/debug/dnssec-keymgr.exe
-CHECKZONE=$TOP/build/debug/named-checkzone.exe
-CHECKCONF=$TOP/build/debug/named-checkconf.exe
-PK11GEN="$TOP/build/debug/pkcs11-keygen.exe -q -s ${SLOT:-0} -p ${HSMPIN:-1234}"
-PK11LIST="$TOP/build/debug/pkcs11-list.exe -s ${SLOT:-0} -p ${HSMPIN:-1234}"
-PK11DEL="$TOP/build/debug/pkcs11-destroy.exe -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0"
-JOURNALPRINT=$TOP/build/debug/named-journalprint.exe
-VERIFY=$TOP/build/debug/dnssec-verify.exe
-ARPANAME=$TOP/build/debug/arpaname.exe
+LWRESD="$TOP/Build/Debug/named@EXEEXT@ -l"
+DIG=$TOP/Build/Debug/dig@EXEEXT@
+DELV=$TOP/Build/Debug/delv@EXEEXT@
+RNDC=$TOP/Build/Debug/rndc@EXEEXT@
+NSUPDATE=$TOP/Build/Debug/nsupdate@EXEEXT@
+DDNSCONFGEN=$TOP/Build/Debug/ddns-confgen@EXEEXT@
+TSIGKEYGEN=$TOP/Build/Debug/tsig-keygen@EXEEXT@
+RNDCCONFGEN=$TOP/Build/Debug/rndc-confgen@EXEEXT@
+KEYGEN=$TOP/Build/Debug/dnssec-keygen@EXEEXT@
+KEYFRLAB=$TOP/Build/Debug/dnssec-keyfromlabel@EXEEXT@
+SIGNER=$TOP/Build/Debug/dnssec-signzone@EXEEXT@
+REVOKE=$TOP/Build/Debug/dnssec-revoke@EXEEXT@
+SETTIME=$TOP/Build/Debug/dnssec-settime@EXEEXT@
+DSFROMKEY=$TOP/Build/Debug/dnssec-dsfromkey@EXEEXT@
+IMPORTKEY=$TOP/Build/Debug/dnssec-importkey@EXEEXT@
+CHECKDS=$TOP/Build/Debug/dnssec-checkds@EXEEXT@
+COVERAGE=$TOP/Build/Debug/dnssec-coverage@EXEEXT@
+KEYMGR=$TOP/Build/Debug/dnssec-keymgr@EXEEXT@
+CHECKZONE=$TOP/Build/Debug/named-checkzone@EXEEXT@
+CHECKCONF=$TOP/Build/Debug/named-checkconf@EXEEXT@
+PK11GEN="$TOP/Build/Debug/pkcs11-keygen@EXEEXT@ -q -s ${SLOT:-0} -p ${HSMPIN:-1234}"
+PK11LIST="$TOP/Build/Debug/pkcs11-list@EXEEXT@ -s ${SLOT:-0} -p ${HSMPIN:-1234}"
+PK11DEL="$TOP/Build/Debug/pkcs11-destroy@EXEEXT@ -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0"
+JOURNALPRINT=$TOP/Build/Debug/named-journalprint@EXEEXT@
+VERIFY=$TOP/Build/Debug/dnssec-verify@EXEEXT@
+ARPANAME=$TOP/Build/Debug/arpaname@EXEEXT@
 RESOLVE=$TOP/lib/samples/resolve
-RRCHECKER=$TOP/build/debug/named-rrchecker.exe
-GENRANDOM=$TOP/build/debug/genrandom.exe
-NSLOOKUP=$TOP/build/debug/nslookup.exe
-DNSTAPREAD="$TOP/build/debug/dnstap-read.exe"
-MDIG="$TOP/build/debug/mdig.exe"
-NZD2NZF="$TOP/build/debug/named-nzd2nzf.exe"
+RRCHECKER=$TOP/Build/Debug/named-rrchecker@EXEEXT@
+GENRANDOM=$TOP/Build/Debug/genrandom@EXEEXT@
+NSLOOKUP=$TOP/Build/Debug/nslookup@EXEEXT@
+DNSTAPREAD=$TOP/Build/Debug/dnstap-read@EXEEXT@
+MDIG=$TOP/Build/Debug/mdig@EXEEXT@
+NZD2NZF=$TOP/Build/Debug/named-nzd2nzf@EXEEXT@
 FSTRM_CAPTURE=@FSTRM_CAPTURE@
 
 RANDFILE=$TOP/bin/tests/system/random.data

diff --git a/win32utils/Configure b/win32utils/Configure
index b6c695be1c4c12d602da8881fa24c3687e3806d6..40c97e5870adbe7766fa21dbdbab2b57755bbccd 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -111,7 +111,7 @@ my @filelist = ("..\\bin\\check\\win32\\checktool.dsp",
                 "..\\bin\\tests\\resolver\\win32\\t_resolver.mak",
                 "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.dsp",
                 "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.mak",
-                "..\\bin\\tests\\system\\conf.sh",
+                "..\\bin\\tests\\system\\conf.sh.win32",
                 "..\\bin\\tests\\tasks\\win32\\t_tasks.dsp",
                 "..\\bin\\tests\\tasks\\win32\\t_tasks.mak",
                 "..\\bin\\tests\\timers\\win32\\t_timers.dsp",
@@ -446,6 +446,7 @@ my @substvar = ("BIND9_VERSION",
                 "COPTMLD",
                 "COPTX",
                 "COPTY",
+                "EXEEXT",
                 "expanded_sysconfdir",
                 "INTRINSIC",
                 "MACHINE",
@@ -456,24 +457,24 @@ my @substvar = ("BIND9_VERSION",
                 "PYTHON",
                 "VCREDIST_PATH"),
 
-my %configsystest;
-my @substsystest = ("CHECK_DSA",
-                                       "CHECKDS",
-                                       "COVERAGE",
-                                       "CURL",
-                                       "DNSTAP",
-                                       "FSTRM_CAPTURE",
-                                       "JSONSTATS",
-                                       "KEYMGR",
-                                       "NZD_TOOLS",
-                                       "PERL",
-                                       "PKCS11_TEST",
-                                       "SHELL",
-                                       "XMLLINT",
-                                       "XMLSTATS",
-                                       "ZLIB"),
-
-                                       
+my %configtest;
+
+my @substtest = ("CHECK_DSA",
+                 "CHECKDS",
+                 "COVERAGE",
+                 "CURL",
+                 "DNSTAP",
+                 "FSTRM_CAPTURE",
+                 "JSONSTATS",
+                 "KEYMGR",
+                 "NZD_TOOLS",
+                 "PERL",
+                 "PKCS11_TEST",
+                 "SHELL",
+                 "XMLLINT",
+                 "XMLSTATS",
+                 "ZLIB"),
+
 # defines
 
 my %configdefd;
@@ -499,6 +500,7 @@ my @substcond = ("AES",
                  "PKCS11",
                  "PYTHON",
                  "SAMPLES",
+                 "STESTS",
                  "TESTS",
                  "XTESTS",
                  "ZLIB");
@@ -523,6 +525,7 @@ my @enablelist = ("developer",
 # with-xxx/without-xxx
 
 my @withlist = ("aes",
+                "cc-alg",
                 "cross-compile",
                 "ecdsa",
                 "extra-tests",
@@ -537,7 +540,7 @@ my @withlist = ("aes",
                 "python",
                 "readline",
                 "samples",
-                "cc-alg",
+                "system-tests",
                 "tests",
                 "tuning",
                 "vcredist",
@@ -580,6 +583,7 @@ my @help = (
 "\nOptional Packages:\n",
 "  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|no|path\n",
 "  with-pkcs11[=PATH]    build with PKCS#11 support yes|no|provider-path\n",
@@ -621,6 +625,7 @@ my $enable_rpz_nsip = "yes";
 my $enable_rpz_nsdname = "yes";
 my $use_tests = "no";
 my $use_xtests = "no";
+my $use_stests = "no";
 my $use_samples = "no";
 my $use_openssl = "auto";
 my $openssl_path = "..\\..\\";
@@ -720,6 +725,8 @@ if (($want_win32 eq "yes") && ($want_x64 eq "yes")) {
     $configvar{"BUILD_MACHINE"} = "/machine:X64";
     $configdefp{"ISC_PLATFORM_BUSYWAITNOP"} = "_mm_pause()";
 }
+# Standard configure variable
+$configvar{"EXEEXT"} = ".exe";
 
 # get the version information
 
@@ -867,6 +874,11 @@ sub mywith {
             $use_tests = "yes";
             $use_xtests = "yes";
         }
+    } elsif ($key =~ /^system-tests$/i) {
+        if ($val =~ /^yes$/i) {
+            $use_tests = "yes";
+            $use_stests = "yes";
+        }
     } elsif ($key =~ /^samples$/i) {
         if ($val =~ /^yes$/i) {
             $use_samples = "yes";
@@ -1108,6 +1120,9 @@ if ($verbose) {
     if ($use_xtests eq "yes") {
         print "extra tests: enabled\n";
     }
+    if ($use_stests eq "yes") {
+        print "system tests: enabled\n";
+    }
     if ($use_samples eq "yes") {
         print "sample programs: enabled\n";
     }
@@ -1471,6 +1486,11 @@ if ($use_xtests eq "yes") {
     $configcond{"XTESTS"} = 1;
 }
 
+# with-system-tests
+if ($use_stests eq "yes") {
+    $configcond{"STESTS"} = 1;
+}
+
 # with-samples
 if ($use_samples eq "yes") {
     $configcond{"SAMPLES"} = 1;
@@ -2554,7 +2574,7 @@ sub kw {
     }
 }
 
-# setup a file with %configcond stack and %config{var,defd,inc,lib,dll}
+# setup a file with %configcond stack and %config{var,defd,inc,lib,dll,test}
 
 sub setupfile {
     my $line;
@@ -2567,7 +2587,7 @@ sub setupfile {
     my @passes;
     my $val;
 
-    open F, $filename . ".win.in" || open F, $filename . ".in" || die $!;
+    open F, $filename . ".in" || die $!;
     @Linesin = <F>;
     close F;
 
@@ -2656,14 +2676,14 @@ sub setupfile {
                 } else {
                     $line = "$`$'";
                 }
-            } elsif ($1 ~~ @substsystest) {
-                               if (defined($configsystest{$1})) {
-                                       $val = kw($configsystest{$1});
-                                       $line = "$`$val$'";
+            } elsif ($1 ~~ @substtest) {
+                if (defined($configtest{$1})) {
+                    $val = kw($configtest{$1});
+                    $line = "$`$val$'";
                 } else {
                     $line = "$`$'";
-                               }
-                       } else {
+                }
+            } else {
                 die "unknown control $& in $filename\n";
             }
         }
@@ -2674,7 +2694,7 @@ sub setupfile {
     if ($verbose) {
         print "Setting up $filename\n";
     }
-       binmode(F);
+    binmode(F);
     foreach $line (@Linesout) {
         print F $line . "\n";
     }

diff --git a/win32utils/bind9.sln.in b/win32utils/bind9.sln.in
index 466dee73435c832b3b90d470fd3217052370e530..f2b541e2acaf5bb35cbfb99ede47454a5edadf7e 100644 (file)
--- a/win32utils/bind9.sln.in
+++ b/win32utils/bind9.sln.in
@@ -76,7 +76,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "..\bin\win32
                {351D3872-707B-46AD-8BC0-5A668B8C745B} = {351D3872-707B-46AD-8BC0-5A668B8C745B}\r
                {2CB7B128-5954-4FAF-B5EA-501B23BB8054} = {2CB7B128-5954-4FAF-B5EA-501B23BB8054}\r
                {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F} = {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F}\r
-               {764DBE24-C8B3-46E8-BE73-196431353A5D} = {764DBE24-C8B3-46E8-BE73-196431353A5D}\r
 @END TESTS\r
 @IF XTESTS\r
                {14751171-C40E-40EE-A2F0-37FFC3CCD4A2} = {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}\r
@@ -87,6 +86,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "..\bin\win32
                {CC7340C1-CBAF-4145-969A-73AE960401D6} = {CC7340C1-CBAF-4145-969A-73AE960401D6}\r
                {E55653C8-5501-4871-A97C-C926631F40F9} = {E55653C8-5501-4871-A97C-C926631F40F9}\r
 @END XTESTS\r
+@IF STESTS\r
+               {764DBE24-C8B3-46E8-BE73-196431353A5D} = {764DBE24-C8B3-46E8-BE73-196431353A5D}\r
+@END STESTS\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen", "..\lib\dns\win32\gen.vcxproj", "{A3F71D12-F38A-4C77-8D87-8E8854CA74A1}"\r
@@ -587,14 +589,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_timers", "..\bin\tests\ti
                {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencheck", "..\bin\tests\system\win32\gencheck.vcxproj", "{764DBE24-C8B3-46E8-BE73-196431353A5D}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
-               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
-               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
-               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
-       EndProjectSection\r
-EndProject\r
 @END TESTS\r
 @IF XTESTS\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "backtrace_test", "..\bin\tests\win32\backtrace_test.vcxproj", "{14751171-C40E-40EE-A2F0-37FFC3CCD4A2}"\r
@@ -640,6 +634,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timer_test", "..\bin\tests\
        EndProjectSection\r
 EndProject\r
 @END XTESTS\r
+@IF STESTS\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencheck", "..\bin\tests\system\win32\gencheck.vcxproj", "{764DBE24-C8B3-46E8-BE73-196431353A5D}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+@END STESTS\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|@PLATFORM@ = Debug|@PLATFORM@\r
@@ -911,10 +915,6 @@ Global
                {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
                {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
                {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
-               {764DBE24-C8B3-46E8-BE73-196431353A5D}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
-               {764DBE24-C8B3-46E8-BE73-196431353A5D}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
-               {764DBE24-C8B3-46E8-BE73-196431353A5D}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
-               {764DBE24-C8B3-46E8-BE73-196431353A5D}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
 @END TESTS\r
 @IF XTESTS\r
                {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
@@ -946,6 +946,12 @@ Global
                {E55653C8-5501-4871-A97C-C926631F40F9}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
                {E55653C8-5501-4871-A97C-C926631F40F9}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
 @END XTESTS\r
+@IF STESTS\r
+               {764DBE24-C8B3-46E8-BE73-196431353A5D}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {764DBE24-C8B3-46E8-BE73-196431353A5D}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {764DBE24-C8B3-46E8-BE73-196431353A5D}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {764DBE24-C8B3-46E8-BE73-196431353A5D}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+@END STESTS\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/win32utils/legacy/BINDBuild.dsw.in b/win32utils/legacy/BINDBuild.dsw.in
index e9d5a6ab1c75999c02d25d9458667948195691d7..5e77a04f8956d0d71f9c6580fa8b5bbf83b29b28 100644 (file)
--- a/win32utils/legacy/BINDBuild.dsw.in
+++ b/win32utils/legacy/BINDBuild.dsw.in
@@ -1371,6 +1371,29 @@ Package=<4>
 \r
 @END XTESTS\r
 ###############################################################################\r
+@IF STESTS\r
+###############################################################################\r
+\r
+Project: "gencheck"="..\..\bin\tests\system\win32\gencheck.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libtests\r
+    End Project Dependency\r
+}}}\r
+\r
+@END STESTS\r
 \r
 Global:\r
 \r

diff --git a/win32utils/legacy/BuildAll.bat.in b/win32utils/legacy/BuildAll.bat.in
index df633ab6590fdbdec399ee6645b04ef99dc404c4..0bd5abc4d385ff43e9270c0666e0b98070ef52ad 100644 (file)
--- a/win32utils/legacy/BuildAll.bat.in
+++ b/win32utils/legacy/BuildAll.bat.in
@@ -217,6 +217,12 @@ nmake /nologo -f timer_test.mak CFG="timer_test - @PLATFORM@ Release"  NO_EXTERN
 cd ..\..
 @END XTESTS
 
+@IF STESTS
+cd tests\system\win32
+nmake /nologo -f gencheck.mak CFG="gencheck - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..\..
+@END STESTS
+
 rem This is the BIND 9 Installer
 
 cd win32\BINDInstall