diff --git a/testing/do-tests b/testing/do-tests
index fcadd7942..6548345e1 100755
--- a/testing/do-tests
+++ b/testing/do-tests
@@ -46,6 +46,7 @@ SOURCEIP_ROUTING_TABLE=220
testnumber="0"
failed_cnt="0"
passed_cnt="0"
+subdir_cnt="0"
##############################################################################
# copy default tests to $BUILDDIR
@@ -185,13 +186,11 @@ echo
##############################################################################
# enter specific test directory
#
-
if [ $# -gt 0 ]
then
- TESTS=$*
+ TESTS=$(printf "%s\n" $* | sort -u)
else
- # set internal field seperator
- TESTS="`ls $DEFAULTTESTSDIR`"
+ TESTS=$(ls $DEFAULTTESTSDIR)
fi
for SUBDIR in $TESTS
@@ -214,12 +213,18 @@ do
else
FIRST=" "
fi
+
+ if [ $subdir_cnt != 0 ]
+ then
+ echo " | $subdir_cnt | " >> $INDEX
+ echo " | " >> $INDEX
+ echo " " >> $INDEX
+ subdir_cnt="0"
+ fi
echo " " >> $INDEX
echo " | $FIRST | ">> $INDEX
echo " $SUBDIR | " >> $INDEX
- echo " x | " >> $INDEX
- echo " | " >> $INDEX
- echo "
" >> $INDEX
+
SUBTESTSINDEX=$TODAYDIR/$SUBDIR/index.html
cat > $SUBTESTSINDEX <<@EOF
@@ -259,6 +264,7 @@ do
for name in $SUBTESTS
do
let "testnumber += 1"
+ let "subdir_cnt += 1"
testname=$SUBDIR/$name
log_action " $testnumber $testname:"
@@ -900,6 +906,15 @@ cat >> $TESTRESULTSHTML << @EOF
@EOF
+if [ $subdir_cnt != 0 ]
+then
+cat >> $INDEX << @EOF
+ $subdir_cnt |
+ |
+
+@EOF
+fi
+
let "all_cnt = $passed_cnt + $failed_cnt"
cat >> $INDEX << @EOF