breeze/inetutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/inetutils.git synced 2026-01-12 00:19:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ping, tftp, traceroute: Improve the test suite.

Browse Source
This commit is contained in:
Alfred M. Szmidt
2010-10-31 19:56:53 +01:00
parent cc3c8e7c7a
commit 5b174beae5
4 changed files with 75 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2010-10-31 Mats Erik Andersson <gnu@gisladisker.se>
Improve the test suite.
* tests/tftp.sh: Make it robust and portable to GNU/Linux and BSD.
* tests/ping-localhost.sh: Test `ping' and `ping6'.
* tests/traceroute-localhost.sh: Test UDP and ICMP.
2010-10-31 Ludovic Courtès <ludo@gnu.org>
tftp: Resolve the "tftp" service only when no port is specified.

18
tests/ping-localhost.sh
View File

@@ -18,6 +18,10 @@
# along with this program. If not, see `http://www.gnu.org/licenses/'.
PING=${PING:-../ping/ping$EXEEXT}
TARGET=${TARGET:-127.0.0.1}
PING6=${PING6:-../ping/ping6$EXEEXT}
TARGET6=${TARGET6:-::1}
if [ $VERBOSE ]; then
set -x
@@ -29,6 +33,16 @@ if [ `id -u` != 0 ]; then
exit 77
fi
$PING -c 1 127.0.0.1; errno=$?
errno=0
errno2=0
exit $errno
$PING -c 1 $TARGET || errno=$?
test $errno -eq 0 || echo "Failed at pinging $TARGET." >&2
# Host might not have been built with IPv6 support..
test -x $PING6 && $PING6 -c 1 $TARGET6 || errno2=$?
test $errno2 -eq 0 || echo "Failed at pinging $TARGET6." >&2
test $errno -eq 0 || exit $errno
exit $errno2

47
tests/tftp.sh
View File

@@ -22,13 +22,15 @@
TFTP="${TFTP:-../src/tftp$EXEEXT}"
TFTPD="${TFTPD:-$PWD/../src/tftpd$EXEEXT}"
INETD="${INETD:-../src/inetd$EXEEXT}"
IFCONFIG="${IFCONFIG:-../ifconfig/ifconfig$EXEEXT}"
IFCONFIG="${IFCONFIG:-../ifconfig/ifconfig$EXEEXT --format=unix}"
PORT=7777
AF=${AF:-inet}
PROTO=${PROTO:-udp}
PORT=${PORT:-7777}
INETD_CONF="$PWD/inetd.conf.tmp"
ADDRESSES="`$IFCONFIG | grep 'inet addr:' | \
sed -e's/inet addr:\([^ ]\+\)[[:blank:]].*$/\1/g'`"
ADDRESSES="`$IFCONFIG | sed -e "/$AF /!d" \
-e "s/^.*$AF[[:blank:]]\([:.0-9]\{1,\}\)[[:blank:]].*$/\1/g"`"
if [ "$VERBOSE" ]; then
set -x
@@ -37,17 +39,38 @@ if [ "$VERBOSE" ]; then
"$INETD" --version
fi
# Check that the port is still available
netstat -na | grep -q "^$PROTO .*$PORT "
if test $? -eq 0; then
echo "Desired port $PORT/$PROTO is already in use."
exit 1
fi
# Create `inetd.conf'. Note: We want $TFTPD to be an absolute file
# name because `inetd' chdirs to `/' in daemon mode; ditto for
# $INETD_CONF.
cat > "$INETD_CONF" <<EOF
$PORT dgram udp wait $USER $TFTPD tftpd -l `pwd`/tftp-test
$PORT dgram $PROTO wait $USER $TFTPD tftpd -l `pwd`/tftp-test
EOF
# Launch `inetd', assuming it's reachable at all $ADDRESSES.
$INETD "${VERBOSE:+-d}" "$INETD_CONF" &
$INETD -d "$INETD_CONF" &
inetd_pid="$!"
test -z "$VERBOSE" || echo "Launched Inetd as process $inetd_pid." >&2
# Wait somewhat for the service to settle.
sleep 1
# Did `inetd' really succeed in establishing a listener?
netstat -na | grep "^$PROTO .*$PORT "
if test $? -ne 0; then
# No it did not.
ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
echo "Failed in starting correct Inetd instance." >&2
exit 1
fi
if [ -f /dev/urandom ]; then
input="/dev/urandom"
else
@@ -56,7 +79,9 @@ fi
rm -fr tftp-test tftp-test-file
mkdir tftp-test && \
dd if="$input" of="tftp-test/tftp-test-file" bs=1024 count=170
dd if="$input" of="tftp-test/tftp-test-file" bs=1024 count=170 2>/dev/null
echo "Looks into $ADDRESSES."
for addr in $ADDRESSES; do
echo "trying with address \`$addr'..." >&2
@@ -69,12 +94,18 @@ for addr in $ADDRESSES; do
if [ "$result" -ne 0 ]; then
# Failure.
test -z "$VERBOSE" || echo "Failed comparison for $addr." >&2
break
else
test -z "$VERBOSE" || echo "Successful comparison for $addr." >&2
fi
done
kill "$inetd_pid"
+ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
rm -rf tftp-test tftp-test-file "$INETD_CONF"
# Minimal clean up
echo
exit $result

14
tests/traceroute-localhost.sh
View File

@@ -18,6 +18,7 @@
# along with this program. If not, see `http://www.gnu.org/licenses/'.
TRACEROUTE=${TRACEROUTE:-../src/traceroute$EXEEXT}
TARGET=${TARGET:-127.0.0.1}
if [ $VERBOSE ]; then
set -x
@@ -29,6 +30,15 @@ if [ `id -u` != 0 ]; then
exit 77
fi
$TRACEROUTE 127.0.0.1; errno=$?
errno=0
errno2=0
exit $errno
$TRACEROUTE --type=udp $TARGET || errno=$?
test $errno -eq 0 || echo "Failed at UDP tracing." >&2
$TRACEROUTE --type=icmp $TARGET || errno2=$?
test $errno2 -eq 0 || echo "Failed at ICMP tracing." >&2
test $errno -eq 0 || exit $errno
exit $errno2