[rt42931] Get rid of d2u, use -o igncr instead

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 46647ec04bb58dd7d307c5319cae8f1c61f64f38..18062635289572dd657eeec9f21c5eeaa6030ec9 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -85,9 +85,6 @@ XMLLINT=@XMLLINT@
 # PERL will be an empty string if no perl interpreter was found.
 PERL=@PERL@
 
-# D2U is used only on Windows to strip '\r' out of windows commands outputs
-D2U=cat
-
 if test -n "$PERL"
 then
        if $PERL -e "use IO::Socket::INET6;" 2> /dev/null

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

diff --git a/win32utils/Configure b/win32utils/Configure
index fd7e8aaa1e7ea2e7611b8b639fb0e656139a41be..061c02170819f98bb41b3964db91820792d3c734 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -472,7 +472,7 @@ my @substsystest = ("CHECK_DSA",
 # 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";
+$configsystest{"SHELL"} = "\"/bin/bash -o igncr\"";
 
                                        
 # defines