svn commit: r234257 - projects/net80211_testsuite/wtap/003
Monthadar Al Jaberi
monthadar at FreeBSD.org
Sat Apr 14 00:39:41 UTC 2012
Author: monthadar
Date: Sat Apr 14 00:39:40 2012
New Revision: 234257
URL: http://svn.freebsd.org/changeset/base/234257
Log:
* Modified so that the test script returns 0 on success otherwise failure,
which is returned in teardown();
* Added info() routine that should be used instead of calling echo directly;
* Modified loggin format to print the number of the test on each log line;
* Modified loggin output to print the name of the test and date of running
the test;
* Modified teardown() to explicitly unlink the wtap simulator visibility
between the nodes;
Approved by: adrian (mentor)
Modified:
projects/net80211_testsuite/wtap/003/test.sh
Modified: projects/net80211_testsuite/wtap/003/test.sh
==============================================================================
--- projects/net80211_testsuite/wtap/003/test.sh Sat Apr 14 00:39:15 2012 (r234256)
+++ projects/net80211_testsuite/wtap/003/test.sh Sat Apr 14 00:39:40 2012 (r234257)
@@ -6,10 +6,11 @@
# + vimage - to configure/destroy vtap nodes
# The name of the test that will be printed in the begining
+TEST_NBR="003"
TEST_NAME="3 nodes in a mesh topology"
-# Global flags
-FLAG_QUIET=0
+# Return value from this test, 0 success failure otherwise
+TEST_RESULT=127
# The number of nodes to test
NBR_NODES=3
@@ -19,22 +20,13 @@ IP_SUBNET="192.168.2."
cmd()
{
- if [ $FLAG_QUIET = 1 ]; then
- echo "*** " $* >> output
- $* >> output
- else
- echo "*** " $*
- $*
- fi
+ echo "***${TEST_NBR}*** " $*
+ $*
}
info()
{
- if [ $FLAG_QUIET = 1 ]; then
- echo "*** " $* >> output
- else
- echo "*** " $*
- fi
+ echo "***${TEST_NBR}*** " $*
}
descr()
@@ -80,8 +72,8 @@ EOL
setup()
{
# Initialize output file
- echo "" > output
- echo "TEST: ${TEST_NAME}"
+ info "TEST: ${TEST_NAME}"
+ info `date`
# Create wtap/vimage nodes
for i in `seq 1 ${NBR_NODES}`; do
@@ -163,14 +155,27 @@ run()
ping_all
if [ $NBR_FAIL = 0 ]; then
- echo "ALL TESTS PASSED"
+ info "ALL TESTS PASSED"
+ TEST_RESULT=0
else
- echo "FAILED ${NBR_FAIL} of ${NBR_TESTS} TESTS"
+ info "FAILED ${NBR_FAIL} of ${NBR_TESTS} TESTS"
fi
}
teardown()
{
+ cmd vis_map c
+ # Unlink all links
+ # XXX: this is a limitation of the current plugin,
+ # no way to reset vis_map without unload wtap.
+ n="`expr ${NBR_NODES} - 1`"
+ for i in `seq 0 ${n}`; do
+ for j in `seq 0 ${n}`; do
+ if [ $j != $i ]; then
+ cmd vis_map d $i $j
+ fi
+ done
+ done
n="`expr ${NBR_NODES} - 1`"
for i in `seq 0 ${n}`; do
vnet="`expr ${i} + 1`"
@@ -181,6 +186,7 @@ teardown()
cmd wtap d ${wtap_if}
cmd vimage -d ${i}
done
+ exit ${TEST_RESULT}
}
EXEC_SETUP=0
@@ -189,9 +195,6 @@ EXEC_TEARDOWN=0
while [ "$#" -gt "0" ]
do
case $1 in
- -q)
- FLAG_QUIET=1
- ;;
'all')
EXEC_SETUP=1
EXEC_RUN=1
@@ -211,7 +214,7 @@ do
exit 0
;;
*)
- echo "$0 {all | setup | run | teardown | descr [-q]}"
+ echo "$0 {all | setup | run | teardown | descr}"
exit 127
;;
esac
More information about the svn-src-projects
mailing list