diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-04 18:46:21 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 15:22:08 +0100 |
| commit | beff82dd98c20570daf166b39cadcdf76a661e57 (patch) | |
| tree | 8c4b0c41365eb83d969a07ba8d01529784c4efa6 /testing | |
| parent | ffe710ae7136874aed62ca849c523fa62a0cdce9 (diff) | |
| download | strongswan-beff82dd98c20570daf166b39cadcdf76a661e57.tar.bz2 strongswan-beff82dd98c20570daf166b39cadcdf76a661e57.tar.xz | |
Adjust strongSwan version handling in HTML output
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/do-tests | 46 | ||||
| -rwxr-xr-x | testing/scripts/build-umlrootfs | 3 | ||||
| -rw-r--r-- | testing/scripts/recipes/strongswan.mk | 2 | ||||
| -rwxr-xr-x | testing/testing.conf | 3 |
4 files changed, 29 insertions, 25 deletions
diff --git a/testing/do-tests b/testing/do-tests index adc3e824f..353cfa60e 100755 --- a/testing/do-tests +++ b/testing/do-tests @@ -114,25 +114,22 @@ done # create header for the results html file # -KERNEL_VERSION=`basename $KERNEL .tar.bz2` -IPSEC_VERSION=`basename $STRONGSWAN .tar.bz2` - ENVIRONMENT_HEADER=$(cat <<@EOF - <table border="0" cellspacing="2"> + <table border="0" cellspacing="2" cellpadding="2"> <tr valign="top"> - <td><b>Host:</b></td> + <td><b>Host</b></td> <td colspan="3">`uname -a`</td> </tr> <tr valign="top"> - <td><b>UML kernel: </b></td> - <td colspan="3">$KERNEL_VERSION</td> + <td><b>UML kernel</b></td> + <td colspan="3">$KERNELVERSION</td> </tr> <tr valign="top"> - <td><b>IPsec:</b></td> - <td colspan="3">$IPSEC_VERSION</td> + <td><b>strongSwan</b></td> + <td colspan="3">$SWANVERSION</td> </tr> <tr valign="top"> - <td><b>Date:</b></td> + <td><b>Date</b></td> <td colspan="3">$TESTDATE</td> </tr> <tr> @@ -170,9 +167,9 @@ cat > $TESTRESULTSHTML <<@EOF </tr> @EOF -cecho "UML kernel: $KERNEL_VERSION" -cecho "IPsec: $IPSEC_VERSION" -cecho "Date: $TESTDATE" +cecho "UML kernel : $KERNELVERSION" +cecho "strongSwan : $SWANVERSION" +cecho "Date : $TESTDATE" cecho "" @@ -208,7 +205,7 @@ do mkdir $TODAYDIR/$SUBDIR if [ $testnumber == 0 ] then - FIRST="<b>Category:</b>" + FIRST="<b>Category</b>" else FIRST=" " fi @@ -227,17 +224,17 @@ do <body> <div><a href="../index.html">strongSwan UML Tests</a> / $SUBDIR</div> <h2>strongSwan $SUBDIR Tests</h2> - <table border="0" cellspacing="2"> + <table border="0" cellspacing="2" cellpadding="2"> <tr valign="top"> - <td><b>UML kernel: </b></td> - <td colspan="3">$KERNEL_VERSION</td> + <td><b>UML kernel</b></td> + <td colspan="3">$KERNELVERSION</td> </tr> <tr valign="top"> - <td><b>IPsec:</b></td> - <td colspan="3">$IPSEC_VERSION</td> + <td><b>strongSwan</b></td> + <td colspan="3">$SWANVERSION</td> </tr> <tr valign="top"> - <td><b>Date:</b></td> + <td><b>Date</b></td> <td colspan="3">$TESTDATE</td> </tr> <tr> @@ -746,10 +743,10 @@ cat >> $TESTRESULTSHTML << @EOF <td> </td><td> </td><td> </td><td> </td> </tr> <tr> - <td><b>Passed:</b></td><td><b><font color="green">$passed_cnt</font></b></td><td> </td><td> </td> + <td><b>Passed</b></td><td><b><font color="green">$passed_cnt</font></b></td><td> </td><td> </td> </tr> <tr> - <td><b>Failed:</b></td><td><b><font color="red">$failed_cnt</font></b></td><td> </td><td> </td> + <td><b>Failed</b></td><td><b><font color="red">$failed_cnt</font></b></td><td> </td><td> </td> </tr> </table> </body> @@ -766,7 +763,7 @@ cat >> $INDEX << @EOF <td> </td> </tr> <tr> - <td><b>Failed:</b></td> + <td><b>Failed</b></td> <td> </td> <td align="right"><b><font color="red">$failed_cnt</font></b></td> <td> </td> @@ -797,6 +794,9 @@ cecho "" cecho "The results are available in $TODAYDIR" cecho "or via the link http://$ipv4_winnetou/testresults/$TESTDATE" +ENDDATE=`date +%Y%m%d-%H%M` +cecho "" +cecho "Finished: $ENDDATE" ########################################################################## # close ssh sessions diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs index f321463db..85682fa21 100755 --- a/testing/scripts/build-umlrootfs +++ b/testing/scripts/build-umlrootfs @@ -75,7 +75,8 @@ for r in $RECIPES do cecho-n " - $r.." cp $RECPDIR/$r ${LOOPDIR}/root/compile - chroot ${LOOPDIR} make -C /root/compile -f $r >>$LOGFILE 2>&1 + chroot ${LOOPDIR} make SWANVERSION=$SWANVERSION -C /root/compile -f $r \ + >> $LOGFILE 2>&1 if [ $? != 0 ]; then cecho "failed" else diff --git a/testing/scripts/recipes/strongswan.mk b/testing/scripts/recipes/strongswan.mk index 4b8263112..76d2d0882 100644 --- a/testing/scripts/recipes/strongswan.mk +++ b/testing/scripts/recipes/strongswan.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -PV = 5.0.1 +PV = $(SWANVERSION) PKG = strongswan-$(PV) TAR = $(PKG).tar.bz2 SRC = http://download.strongswan.org/$(TAR) diff --git a/testing/testing.conf b/testing/testing.conf index 95bdaac02..611fd4ea4 100755 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -30,6 +30,9 @@ KERNELCONFIG=$UMLTESTDIR/.config-3.5 # Bzipped uml patch for kernel UMLPATCH=$UMLTESTDIR/ha-3.0.patch.bz2 +# strongSwan version used in tests +SWANVERSION=5.0.2dr4 + # Amount of Memory to use per UML [MB]. # If "auto" is stated 1/12 of total host ram will be used. # Examples: MEM=64, MEM="128", MEM="auto" |