4487. [test] Make system tests work on Windows. [RT #42931]
This commit is contained in:
@@ -30,7 +30,7 @@ if $test_fixed; then
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
|
||||
do
|
||||
$DIGCMD @10.53.0.1 fixed.example > dig.out.fixed || ret=1
|
||||
cmp -s dig.out.fixed dig.out.fixed.good || ret=1
|
||||
$DIFF dig.out.fixed dig.out.fixed.good >/dev/null || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -45,15 +45,15 @@ else
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.fixed dig.out.$j
|
||||
else
|
||||
cmp -s dig.out.fixed dig.out.$j && matches=`expr $matches + 1`
|
||||
$DIFF dig.out.fixed dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
cmp -s dig.out.0 dig.out.1 && ret=1
|
||||
cmp -s dig.out.0 dig.out.2 && ret=1
|
||||
cmp -s dig.out.0 dig.out.3 && ret=1
|
||||
cmp -s dig.out.1 dig.out.2 && ret=1
|
||||
cmp -s dig.out.1 dig.out.3 && ret=1
|
||||
cmp -s dig.out.2 dig.out.3 && ret=1
|
||||
$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
|
||||
if [ $matches -ne 16 ]; then ret=1; fi
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -72,15 +72,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic dig.out.$j
|
||||
else
|
||||
cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
|
||||
$DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
cmp -s dig.out.0 dig.out.1 && ret=1
|
||||
cmp -s dig.out.0 dig.out.2 && ret=1
|
||||
cmp -s dig.out.0 dig.out.3 && ret=1
|
||||
cmp -s dig.out.1 dig.out.2 && ret=1
|
||||
cmp -s dig.out.1 dig.out.3 && ret=1
|
||||
cmp -s dig.out.2 dig.out.3 && ret=1
|
||||
$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
|
||||
if [ $matches -ne 16 ]; then ret=1; fi
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -98,15 +98,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic2 dig.out.$j
|
||||
else
|
||||
cmp -s dig.out.cyclic2 dig.out.$j && matches=`expr $matches + 1`
|
||||
$DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
cmp -s dig.out.0 dig.out.1 && ret=1
|
||||
cmp -s dig.out.0 dig.out.2 && ret=1
|
||||
cmp -s dig.out.0 dig.out.3 && ret=1
|
||||
cmp -s dig.out.1 dig.out.2 && ret=1
|
||||
cmp -s dig.out.1 dig.out.3 && ret=1
|
||||
cmp -s dig.out.2 dig.out.3 && ret=1
|
||||
$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
|
||||
if [ $matches -ne 16 ]; then ret=1; fi
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -122,7 +122,7 @@ do
|
||||
match=0
|
||||
for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
|
||||
do
|
||||
eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1"
|
||||
eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
|
||||
if [ $match -eq 1 ]; then break; fi
|
||||
done
|
||||
if [ $match -eq 0 ]; then ret=1; fi
|
||||
@@ -146,7 +146,7 @@ if $test_fixed; then
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
|
||||
do
|
||||
$DIGCMD @10.53.0.2 fixed.example > dig.out.fixed || ret=1
|
||||
cmp -s dig.out.fixed dig.out.fixed.good || ret=1
|
||||
$DIFF dig.out.fixed dig.out.fixed.good || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -165,15 +165,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic dig.out.$j
|
||||
else
|
||||
cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
|
||||
$DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
cmp -s dig.out.0 dig.out.1 && ret=1
|
||||
cmp -s dig.out.0 dig.out.2 && ret=1
|
||||
cmp -s dig.out.0 dig.out.3 && ret=1
|
||||
cmp -s dig.out.1 dig.out.2 && ret=1
|
||||
cmp -s dig.out.1 dig.out.3 && ret=1
|
||||
cmp -s dig.out.2 dig.out.3 && ret=1
|
||||
$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
|
||||
if [ $matches -ne 16 ]; then ret=1; fi
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -191,15 +191,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic2 dig.out.$j
|
||||
else
|
||||
cmp -s dig.out.cyclic2 dig.out.$j && matches=`expr $matches + 1`
|
||||
$DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
cmp -s dig.out.0 dig.out.1 && ret=1
|
||||
cmp -s dig.out.0 dig.out.2 && ret=1
|
||||
cmp -s dig.out.0 dig.out.3 && ret=1
|
||||
cmp -s dig.out.1 dig.out.2 && ret=1
|
||||
cmp -s dig.out.1 dig.out.3 && ret=1
|
||||
cmp -s dig.out.2 dig.out.3 && ret=1
|
||||
$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
|
||||
if [ $matches -ne 16 ]; then ret=1; fi
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -216,7 +216,7 @@ $DIGCMD @10.53.0.2 random.example > dig.out.random || ret=1
|
||||
match=0
|
||||
for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
|
||||
do
|
||||
eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1"
|
||||
eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
|
||||
if [ $match -eq 1 ]; then break; fi
|
||||
done
|
||||
if [ $match -eq 0 ]; then ret=1; fi
|
||||
@@ -256,7 +256,7 @@ if $test_fixed; then
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
|
||||
do
|
||||
$DIGCMD @10.53.0.2 fixed.example > dig.out.fixed || ret=1
|
||||
cmp -s dig.out.fixed dig.out.fixed.good || ret=1
|
||||
$DIFF dig.out.fixed dig.out.fixed.good || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -275,15 +275,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic dig.out.$j
|
||||
else
|
||||
cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
|
||||
$DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
cmp -s dig.out.0 dig.out.1 && ret=1
|
||||
cmp -s dig.out.0 dig.out.2 && ret=1
|
||||
cmp -s dig.out.0 dig.out.3 && ret=1
|
||||
cmp -s dig.out.1 dig.out.2 && ret=1
|
||||
cmp -s dig.out.1 dig.out.3 && ret=1
|
||||
cmp -s dig.out.2 dig.out.3 && ret=1
|
||||
$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
|
||||
if [ $matches -ne 16 ]; then ret=1; fi
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -301,15 +301,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic2 dig.out.$j
|
||||
else
|
||||
cmp -s dig.out.cyclic2 dig.out.$j && matches=`expr $matches + 1`
|
||||
$DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
cmp -s dig.out.0 dig.out.1 && ret=1
|
||||
cmp -s dig.out.0 dig.out.2 && ret=1
|
||||
cmp -s dig.out.0 dig.out.3 && ret=1
|
||||
cmp -s dig.out.1 dig.out.2 && ret=1
|
||||
cmp -s dig.out.1 dig.out.3 && ret=1
|
||||
cmp -s dig.out.2 dig.out.3 && ret=1
|
||||
$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
|
||||
if [ $matches -ne 16 ]; then ret=1; fi
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -326,7 +326,7 @@ do
|
||||
match=0
|
||||
for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
|
||||
do
|
||||
eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1"
|
||||
eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
|
||||
if [ $match -eq 1 ]; then break; fi
|
||||
done
|
||||
if [ $match -eq 0 ]; then ret=1; fi
|
||||
@@ -350,7 +350,7 @@ if $test_fixed; then
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
|
||||
do
|
||||
$DIGCMD @10.53.0.3 fixed.example > dig.out.fixed || ret=1
|
||||
cmp -s dig.out.fixed dig.out.fixed.good || ret=1
|
||||
$DIFF dig.out.fixed dig.out.fixed.good || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -371,15 +371,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic dig.out.$j
|
||||
else
|
||||
cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
|
||||
$DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
cmp -s dig.out.0 dig.out.1 && ret=1
|
||||
cmp -s dig.out.0 dig.out.2 && ret=1
|
||||
cmp -s dig.out.0 dig.out.3 && ret=1
|
||||
cmp -s dig.out.1 dig.out.2 && ret=1
|
||||
cmp -s dig.out.1 dig.out.3 && ret=1
|
||||
cmp -s dig.out.2 dig.out.3 && ret=1
|
||||
$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
|
||||
if [ $matches -ne 16 ]; then ret=1; fi
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -399,15 +399,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic2 dig.out.$j
|
||||
else
|
||||
cmp -s dig.out.cyclic2 dig.out.$j && matches=`expr $matches + 1`
|
||||
$DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
cmp -s dig.out.0 dig.out.1 && ret=1
|
||||
cmp -s dig.out.0 dig.out.2 && ret=1
|
||||
cmp -s dig.out.0 dig.out.3 && ret=1
|
||||
cmp -s dig.out.1 dig.out.2 && ret=1
|
||||
cmp -s dig.out.1 dig.out.3 && ret=1
|
||||
cmp -s dig.out.2 dig.out.3 && ret=1
|
||||
$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
|
||||
$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
|
||||
$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
|
||||
if [ $matches -ne 16 ]; then ret=1; fi
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -424,7 +424,7 @@ do
|
||||
match=0
|
||||
for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
|
||||
do
|
||||
eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1"
|
||||
eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
|
||||
if [ $match -eq 1 ]; then break; fi
|
||||
done
|
||||
if [ $match -eq 0 ]; then ret=1; fi
|
||||
@@ -451,7 +451,7 @@ $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
|
||||
match=0
|
||||
for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
|
||||
do
|
||||
eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1"
|
||||
eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
|
||||
if [ $match -eq 1 ]; then break; fi
|
||||
done
|
||||
if [ $match -eq 0 ]; then ret=1; fi
|
||||
|
||||
Reference in New Issue
Block a user