[rt42931] More windows-specific things in Configure, some fixes for wildcard system...

diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index 54e0af73ebf2e0654b3715dd29926c8e1fa83b12..7f0db1a24ca7bcb0d3ef4fd0d5acb29fb76d6b80 100644 (file)
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -152,12 +152,22 @@ sub stop_signal {
                print "I:$server didn't die when sent a SIGTERM\n";
                $errors++;
        }
-
-       my $result = kill $sig, $pid;
-       if (!$result) {
-               print "I:$server died before a SIG$sig was sent\n";
+       
+       my $result;
+       if ($^O eq 'cygwin') {
+               $result = system("/bin/kill -f -$sig $pid");
                unlink $pid_file;
-               $errors++;
+               if ($result != 0) {
+                       print "I:$server died before a SIG$sig was sent\n";
+                       $errors++;
+               }
+       } else {
+               $result = kill $sig, $pid;
+               if (!$result) {
+                       print "I:$server died before a SIG$sig was sent\n";
+                       unlink $pid_file;
+                       $errors++;
+               }
        }
 
        return;

diff --git a/bin/tests/system/wildcard/ns1/sign.sh b/bin/tests/system/wildcard/ns1/sign.sh
index 581bc829ee5137eefcbf4d1529259fbd6743b4ac..ff775dbdd6ef98767ccb0be880c81db5e98ba942 100755 (executable)
--- a/bin/tests/system/wildcard/ns1/sign.sh
+++ b/bin/tests/system/wildcard/ns1/sign.sh
@@ -19,8 +19,8 @@ zonefile=dlv.db
 outfile=dlv.db.signed
 dssets="$dssets dsset-$zone"
 
-keyname1=`$KEYGEN -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null` 
-keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null`
+keyname1=`$KEYGEN -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U` 
+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U`
 
 cat $infile $keyname1.key $keyname2.key > $zonefile
 
@@ -33,8 +33,9 @@ zonefile=nsec.db
 outfile=nsec.db.signed
 dssets="$dssets dsset-$zone"
 
-keyname1=`$KEYGEN -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null` 
-keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null`
+echo "|$D2U"
+keyname1=`$KEYGEN -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U` 
+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U`
 
 cat $infile $keyname1.key $keyname2.key > $zonefile
 
@@ -46,8 +47,8 @@ infile=private.nsec.db.in
 zonefile=private.nsec.db
 outfile=private.nsec.db.signed
 
-keyname1=`$KEYGEN -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null` 
-keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null`
+keyname1=`$KEYGEN -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U` 
+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U`
 
 cat $infile $keyname1.key $keyname2.key > $zonefile
 
@@ -70,8 +71,8 @@ zonefile=nsec3.db
 outfile=nsec3.db.signed
 dssets="$dssets dsset-$zone"
 
-keyname1=`$KEYGEN -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -n zone $zone 2> /dev/null` 
-keyname2=`$KEYGEN -f KSK -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -n zone $zone 2> /dev/null`
+keyname1=`$KEYGEN -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U` 
+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U`
 
 cat $infile $keyname1.key $keyname2.key > $zonefile
 
@@ -83,8 +84,8 @@ infile=private.nsec3.db.in
 zonefile=private.nsec3.db
 outfile=private.nsec3.db.signed
 
-keyname1=`$KEYGEN -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -n zone $zone 2> /dev/null` 
-keyname2=`$KEYGEN -f KSK -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -n zone $zone 2> /dev/null`
+keyname1=`$KEYGEN -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U` 
+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U`
 
 cat $infile $keyname1.key $keyname2.key > $zonefile
 
@@ -106,8 +107,8 @@ infile=root.db.in
 zonefile=root.db
 outfile=root.db.signed
 
-keyname1=`$KEYGEN -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null`
-keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null`
+keyname1=`$KEYGEN -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U`
+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null |$D2U`
 
 cat $infile $keyname1.key $keyname2.key $dssets >$zonefile
 

diff --git a/win32utils/Configure b/win32utils/Configure
index 70f7f3fcf9af4acaa0a34b5057c967b5f84dbfa2..fd7e8aaa1e7ea2e7611b8b639fb0e656139a41be 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -442,19 +442,39 @@ my @substvar = ("BIND9_VERSION",
                 "COPTMLD",
                 "COPTX",
                 "COPTY",
-                "CURL", # in CYGWIN
                 "expanded_sysconfdir",
                 "INTRINSIC",
                 "MACHINE",
                 "OPENSSL_PATH",
-                "PERL",  # in CYGWIN
                 "PLATFORM",
                 "PKCS11_TOOLS",
                 "prefix",
                 "PYTHON",
-                "SHELL", # in CYGWIN
                 "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"),
+
+# Configure variables for bin/tests/system/conf.sh.win.in - for cygwin
+$configsystest{"CURL"} = "/bin/curl";
+$configsystest{"PERL"} = "/usr/bin/perl";
+$configsystest{"SHELL"} = "/bin/bash";
+
+                                       
 # defines
 
 my %configdefd;
@@ -702,11 +722,6 @@ if (($want_win32 eq "yes") && ($want_x64 eq "yes")) {
     $configdefp{"ISC_PLATFORM_BUSYWAITNOP"} = "_mm_pause()";
 }
 
-# Configure variables for bin/tests/system/conf.sh.win.in
-$configvar{"CURL"} = "/bin/curl";
-$configvar{"PERL"} = "/bin/perl";
-$configvar{"SHELL"} = "/bin/shell";
-
 # get the version information
 
 my %Versions;
@@ -2642,7 +2657,14 @@ sub setupfile {
                 } else {
                     $line = "$`$'";
                 }
-            } else {
+            } elsif ($1 ~~ @substsystest) {
+                               if (defined($configsystest{$1})) {
+                                       $val = kw($configsystest{$1});
+                                       $line = "$`$val$'";
+                } else {
+                    $line = "$`$'";
+                               }
+                       } else {
                 die "unknown control $& in $filename\n";
             }
         }
@@ -2653,6 +2675,7 @@ sub setupfile {
     if ($verbose) {
         print "Setting up $filename\n";
     }
+       binmode(F);
     foreach $line (@Linesout) {
         print F $line . "\n";
     }