Remove leftover test code for Windows
- Removed all code that only runs under CYGWIN, and made all
code that doesn't run under CYGWIN non-optional.
- Removed the $TP variable which was used to add optional
trailing dots to filenames; they're no longer optional.
- Removed references to pssuspend and dos2unix.
- No need to use environment variables for diff and kill.
- Removed uses of "tr -d '\r'"; this was a workaround for
a cygwin regex bug that is no longer needed.
(cherry picked from commit 1d706f328c)
This commit is contained in:
@@ -24,7 +24,7 @@ for i in 1 2 3 4 5 6 7 8 9 10 11 12
|
||||
do
|
||||
ret=0
|
||||
$DIG +short $DIGOPTS @10.53.0.1 a$i.example a in > dig.out.$i.test$n || ret=1
|
||||
echo 10.0.0.1 | $DIFF - dig.out.$i.test$n || ret=1
|
||||
echo 10.0.0.1 | diff - dig.out.$i.test$n || ret=1
|
||||
if [ $ret != 0 ]
|
||||
then
|
||||
echo_i "#$i failed"
|
||||
@@ -38,7 +38,7 @@ for i in 1 2 3 4 5 6 7
|
||||
do
|
||||
ret=0
|
||||
$DIG +short $DIGOPTS @10.53.0.1 txt$i.example txt in > dig.out.$i.test$n || ret=1
|
||||
echo '"hello"' | $DIFF - dig.out.$i.test$n || ret=1
|
||||
echo '"hello"' | diff - dig.out.$i.test$n || ret=1
|
||||
if [ $ret != 0 ]
|
||||
then
|
||||
echo_i "#$i failed"
|
||||
@@ -52,7 +52,7 @@ for i in 1 2 3
|
||||
do
|
||||
ret=0
|
||||
$DIG +short $DIGOPTS @10.53.0.1 unk$i.example type123 in > dig.out.$i.test$n || ret=1
|
||||
echo '\# 1 00' | $DIFF - dig.out.$i.test$n || ret=1
|
||||
echo '\# 1 00' | diff - dig.out.$i.test$n || ret=1
|
||||
if [ $ret != 0 ]
|
||||
then
|
||||
echo_i "#$i failed"
|
||||
@@ -64,7 +64,7 @@ n=$((n+1))
|
||||
echo_i "querying for NULL record ($n)"
|
||||
ret=0
|
||||
$DIG +short $DIGOPTS @10.53.0.1 null.example null in > dig.out.test$n || ret=1
|
||||
echo '\# 1 00' | $DIFF - dig.out.test$n || ret=1
|
||||
echo '\# 1 00' | diff - dig.out.test$n || ret=1
|
||||
[ $ret = 0 ] || echo_i "failed"
|
||||
status=`expr $status + $ret`
|
||||
|
||||
@@ -72,7 +72,7 @@ n=$((n+1))
|
||||
echo_i "querying for empty NULL record ($n)"
|
||||
ret=0
|
||||
$DIG +short $DIGOPTS @10.53.0.1 empty.example null in > dig.out.test$n || ret=1
|
||||
echo '\# 0' | $DIFF - dig.out.test$n || ret=1
|
||||
echo '\# 0' | diff - dig.out.test$n || ret=1
|
||||
[ $ret = 0 ] || echo_i "failed"
|
||||
status=`expr $status + $ret`
|
||||
|
||||
@@ -82,7 +82,7 @@ for i in 1 2
|
||||
do
|
||||
ret=0
|
||||
$DIG +short $DIGOPTS @10.53.0.1 a$i.example a class10 > dig.out.$i.test$n || ret=1
|
||||
echo '\# 4 0A000001' | $DIFF - dig.out.$i.test$n || ret=1
|
||||
echo '\# 4 0A000001' | diff - dig.out.$i.test$n || ret=1
|
||||
if [ $ret != 0 ]
|
||||
then
|
||||
echo_i "#$i failed"
|
||||
@@ -96,7 +96,7 @@ for i in 1 2 3 4
|
||||
do
|
||||
ret=0
|
||||
$DIG +short $DIGOPTS @10.53.0.1 txt$i.example txt class10 > dig.out.$i.test$n || ret=1
|
||||
echo '"hello"' | $DIFF - dig.out.$i.test$n || ret=1
|
||||
echo '"hello"' | diff - dig.out.$i.test$n || ret=1
|
||||
if [ $ret != 0 ]
|
||||
then
|
||||
echo_i "#$i failed"
|
||||
@@ -110,7 +110,7 @@ for i in 1 2
|
||||
do
|
||||
ret=0
|
||||
$DIG +short $DIGOPTS @10.53.0.1 unk$i.example type123 class10 > dig.out.$i.test$n || ret=1
|
||||
echo '\# 1 00' | $DIFF - dig.out.$i.test$n || ret=1
|
||||
echo '\# 1 00' | diff - dig.out.$i.test$n || ret=1
|
||||
if [ $ret != 0 ]
|
||||
then
|
||||
echo_i "#$i failed"
|
||||
@@ -137,7 +137,7 @@ echo_i "checking large unknown record loading on primary ($n)"
|
||||
for try in 0 1 2 3 4 5 6 7 8 9; do
|
||||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.1 +tcp +short large.example TYPE45234 > dig.out.$i.test$n || { ret=1 ; echo_i "dig failed" ; }
|
||||
$DIFF -s large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "$DIFF failed"; }
|
||||
diff -s large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
|
||||
[ "$ret" -eq 0 ] && break
|
||||
sleep 1
|
||||
done
|
||||
@@ -149,7 +149,7 @@ echo_i "checking large unknown record loading on secondary ($n)"
|
||||
for try in 0 1 2 3 4 5 6 7 8 9; do
|
||||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.2 +tcp +short large.example TYPE45234 > dig.out.$i.test$n || { ret=1 ; echo_i "dig failed" ; }
|
||||
$DIFF -s large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "$DIFF failed"; }
|
||||
diff -s large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
|
||||
[ "$ret" -eq 0 ] && break
|
||||
sleep 1
|
||||
done
|
||||
@@ -167,7 +167,7 @@ echo_i "checking large unknown record loading on secondary ($n)"
|
||||
for try in 0 1 2 3 4 5 6 7 8 9; do
|
||||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.2 +tcp +short large.example TYPE45234 > dig.out.$i.test$n || { ret=1 ; echo_i "dig failed" ; }
|
||||
$DIFF -s large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "$DIFF failed"; }
|
||||
diff -s large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
|
||||
[ "$ret" -eq 0 ] && break
|
||||
sleep 1
|
||||
done
|
||||
@@ -178,7 +178,7 @@ n=$((n+1))
|
||||
echo_i "checking large unknown record loading on inline secondary ($n)"
|
||||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.3 +tcp +short large.example TYPE45234 > dig.out.test$n || { ret=1 ; echo_i "dig failed" ; }
|
||||
$DIFF large.out dig.out.test$n > /dev/null || { ret=1 ; echo_i "$DIFF failed"; }
|
||||
diff large.out dig.out.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
|
||||
[ $ret = 0 ] || echo_i "failed"
|
||||
status=`expr $status + $ret`
|
||||
|
||||
@@ -193,7 +193,7 @@ echo_i "checking large unknown record loading on inline secondary ($n)"
|
||||
for try in 0 1 2 3 4 5 6 7 8 9; do
|
||||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.3 +tcp +short large.example TYPE45234 > dig.out.$i.test$n || { ret=1 ; echo_i "dig failed" ; }
|
||||
$DIFF large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "$DIFF failed"; }
|
||||
diff large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
|
||||
[ "$ret" -eq 0 ] && break
|
||||
sleep 1
|
||||
done
|
||||
@@ -204,7 +204,7 @@ n=$((n+1))
|
||||
echo_i "check that '"'"\\#"'"' is not treated as the unknown escape sequence ($n)"
|
||||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.1 +tcp +short txt8.example txt > dig.out.test$n
|
||||
echo '"#" "2" "0145"' | $DIFF - dig.out.test$n || ret=1
|
||||
echo '"#" "2" "0145"' | diff - dig.out.test$n || ret=1
|
||||
[ $ret = 0 ] || echo_i "failed"
|
||||
status=`expr $status + $ret`
|
||||
|
||||
@@ -212,7 +212,7 @@ n=$((n+1))
|
||||
echo_i "check that 'TXT \# text' is not treated as the unknown escape sequence ($n)"
|
||||
ret=0
|
||||
$DIG $DIGOPTS @10.53.0.1 +tcp +short txt9.example txt > dig.out.test$n
|
||||
echo '"#" "text"' | $DIFF - dig.out.test$n || ret=1
|
||||
echo '"#" "text"' | diff - dig.out.test$n || ret=1
|
||||
[ $ret = 0 ] || echo_i "failed"
|
||||
status=`expr $status + $ret`
|
||||
|
||||
|
||||
Reference in New Issue
Block a user