diff --git a/testing/do-tests b/testing/do-tests index fd11a6324..537a4398e 100755 --- a/testing/do-tests +++ b/testing/do-tests @@ -44,8 +44,8 @@ TESTDATE=`date +%Y%m%d-%H%M` TODAYDIR=$TESTRESULTSDIR/$TESTDATE mkdir $TODAYDIR -TESTRESULTSHTML=$TODAYDIR/index.html -ALLHTML=$TODAYDIR/all.html +TESTRESULTSHTML=$TODAYDIR/all.html +INDEX=$TODAYDIR/index.html DEFAULTTESTSDIR=$UMLTESTDIR/testing/tests testnumber="0" @@ -105,37 +105,45 @@ done KERNEL_VERSION=`basename $KERNEL .tar.bz2` IPSEC_VERSION=`basename $STRONGSWAN .tar.bz2` -cat > $TESTRESULTSHTML <<@EOF +cat > $INDEX <<@EOF - strongSwan UML Testing + strongSwan UML Tests -

strongSwan UML Testing

+

strongSwan UML Tests

- - - - -
Host:`uname -a`
UML kernel:  $KERNEL_VERSION
IPsec:$IPSEC_VERSION
Date:$TESTDATE
-

- - + + + + + + + + + + + + + + + + + + + + + + @EOF -cat > $ALLHTML <<@EOF - - - strongSwan UML Testing - - -

strongSwan UML Testing

-
NumberTestResult
Host:`uname -a`
UML kernel:  $KERNEL_VERSION
IPsec:$IPSEC_VERSION
Date:$TESTDATE
    
- - - - - +cat $INDEX > $TESTRESULTSHTML +cat >> $TESTRESULTSHTML <<@EOF + + + + + @EOF cecho "UML kernel: $KERNEL_VERSION" @@ -174,7 +182,46 @@ do if [ ! -d $TODAYDIR/$SUBDIR ] then mkdir $TODAYDIR/$SUBDIR - echo "" >> $ALLHTML + if [ $testnumber == 0 ] + then + FIRST="Category:" >> $INDEX + SUBTESTSINDEX=$TODAYDIR/$SUBDIR/index.html + cat > $SUBTESTSINDEX <<@EOF + + + strongSwan $SUBDIR Tests + + +

strongSwan $SUBDIR Tests

+
Host:`uname -a`
UML kernel:  $KERNEL_VERSION
IPsec:$IPSEC_VERSION
Date:$TESTDATE
 
NumberTestResult
 $SUBDIR$FIRST$SUBDIR
+ + + + + + + + + + + + + + + + + + + + + + + +@EOF fi for name in $SUBTESTS @@ -531,10 +578,20 @@ do + + +@EOF + cat >> $SUBTESTSINDEX << @EOF + + + + + @EOF done + done @@ -545,14 +602,28 @@ done cat >> $TESTRESULTSHTML << @EOF
UML kernel:  $KERNEL_VERSION
IPsec:$IPSEC_VERSION
Date:$TESTDATE
    
NumberTestResult
$testnumber $testname $STATUS 
$testnumber$name$STATUS 

- Passed:   $passed_cnt
- Failed:   $failed_cnt
+ Passed:   $passed_cnt
+ Failed:   $failed_cnt

@EOF -cat >> $ALLHTML << @EOF +let "all_cnt = $passed_cnt + $failed_cnt" + +cat >> $INDEX << @EOF + +   + all + $all_cnt +   + + + Failed: +   + $failed_cnt +   +