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.
This commit is contained in:
Evan Hunt
Michal Nowak
@@ -37,7 +37,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
|
||||
$DIFF dig.out.fixed dig.out.fixed.good >/dev/null || 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`
|
||||
@@ -52,15 +52,15 @@ else
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.fixed dig.out.$j
|
||||
else
|
||||
$DIFF dig.out.fixed dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
diff dig.out.fixed dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
$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
|
||||
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`
|
||||
@@ -79,15 +79,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic dig.out.$j
|
||||
else
|
||||
$DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
diff dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
$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
|
||||
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`
|
||||
@@ -105,15 +105,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic2 dig.out.$j
|
||||
else
|
||||
$DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
diff dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
$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
|
||||
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`
|
||||
@@ -129,7 +129,7 @@ do
|
||||
match=0
|
||||
for j in $GOOD_RANDOM
|
||||
do
|
||||
eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && 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
|
||||
@@ -154,7 +154,7 @@ done
|
||||
# Ensure 20 further queries result in the same response as the "reference" one.
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
|
||||
$DIGCMD @10.53.0.1 none.example > dig.out.test$i || ret=1
|
||||
$DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
|
||||
diff dig.out.none dig.out.test$i >/dev/null || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -168,7 +168,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
|
||||
$DIFF 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`
|
||||
@@ -187,15 +187,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic dig.out.$j
|
||||
else
|
||||
$DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
diff dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
$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
|
||||
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`
|
||||
@@ -213,15 +213,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic2 dig.out.$j
|
||||
else
|
||||
$DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
diff dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
$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
|
||||
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`
|
||||
@@ -238,7 +238,7 @@ do
|
||||
match=0
|
||||
for j in $GOOD_RANDOM
|
||||
do
|
||||
eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && 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
|
||||
@@ -263,7 +263,7 @@ done
|
||||
# Ensure 20 further queries result in the same response as the "reference" one.
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
|
||||
$DIGCMD @10.53.0.2 none.example > dig.out.test$i || ret=1
|
||||
$DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
|
||||
diff dig.out.none dig.out.test$i >/dev/null || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -293,7 +293,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
|
||||
$DIFF 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`
|
||||
@@ -312,15 +312,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic dig.out.$j
|
||||
else
|
||||
$DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
diff dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
$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
|
||||
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`
|
||||
@@ -338,15 +338,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic2 dig.out.$j
|
||||
else
|
||||
$DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
diff dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
$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
|
||||
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`
|
||||
@@ -363,7 +363,7 @@ do
|
||||
match=0
|
||||
for j in $GOOD_RANDOM
|
||||
do
|
||||
eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && 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
|
||||
@@ -388,7 +388,7 @@ done
|
||||
# Ensure 20 further queries result in the same response as the "reference" one.
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
|
||||
$DIGCMD @10.53.0.2 none.example > dig.out.test$i || ret=1
|
||||
$DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
|
||||
diff dig.out.none dig.out.test$i >/dev/null || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -402,7 +402,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
|
||||
$DIFF 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`
|
||||
@@ -423,15 +423,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic dig.out.$j
|
||||
else
|
||||
$DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
diff dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
$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
|
||||
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`
|
||||
@@ -451,15 +451,15 @@ do
|
||||
if [ $i -le 4 ]; then
|
||||
cp dig.out.cyclic2 dig.out.$j
|
||||
else
|
||||
$DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
diff dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
|
||||
fi
|
||||
done
|
||||
$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
|
||||
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`
|
||||
@@ -476,7 +476,7 @@ do
|
||||
match=0
|
||||
for j in $GOOD_RANDOM
|
||||
do
|
||||
eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && 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
|
||||
@@ -500,7 +500,7 @@ done
|
||||
# Ensure 20 further queries result in the same response as the "reference" one.
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
|
||||
$DIGCMD @10.53.0.3 none.example > dig.out.test$i || ret=1
|
||||
$DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
|
||||
diff dig.out.none dig.out.test$i >/dev/null || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
@@ -517,7 +517,7 @@ do
|
||||
match=0
|
||||
for j in $GOOD_RANDOM
|
||||
do
|
||||
eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && 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
|
||||
@@ -542,7 +542,7 @@ done
|
||||
# Ensure 20 further queries result in the same response as the "reference" one.
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
|
||||
$DIGCMD @10.53.0.4 nomatch.example > dig.out.test$i || ret=1
|
||||
$DIFF dig.out.nomatch dig.out.test$i >/dev/null || ret=1
|
||||
diff dig.out.nomatch dig.out.test$i >/dev/null || ret=1
|
||||
done
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
Reference in New Issue
Block a user