Adjust strongSwan version handling in HTML output
authorReto Buerki <reet@codelabs.ch>
Tue, 4 Dec 2012 17:46:21 +0000 (18:46 +0100)
committerTobias Brunner <tobias@strongswan.org>
Thu, 17 Jan 2013 14:22:08 +0000 (15:22 +0100)
testing/do-tests
testing/scripts/build-umlrootfs
testing/scripts/recipes/strongswan.mk
testing/testing.conf

index adc3e82..353cfa6 100755 (executable)
@@ -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: &nbsp;</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="&nbsp;"
        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: &nbsp;</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>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
     </tr>
     <tr>
-      <td><b>Passed:</b></td><td><b><font color="green">$passed_cnt</font></b></td><td>&nbsp;</td><td>&nbsp;</td>
+      <td><b>Passed</b></td><td><b><font color="green">$passed_cnt</font></b></td><td>&nbsp;</td><td>&nbsp;</td>
     </tr>
     <tr>
-      <td><b>Failed:</b></td><td><b><font color="red">$failed_cnt</font></b></td><td>&nbsp;</td><td>&nbsp;</td>
+      <td><b>Failed</b></td><td><b><font color="red">$failed_cnt</font></b></td><td>&nbsp;</td><td>&nbsp;</td>
     </tr>
   </table>
 </body>
@@ -766,7 +763,7 @@ cat >> $INDEX << @EOF
       <td>&nbsp;</td>
     </tr>
     <tr>
-      <td><b>Failed:</b></td>
+      <td><b>Failed</b></td>
       <td>&nbsp;</td>
       <td align="right"><b><font color="red">$failed_cnt</font></b></td>
       <td>&nbsp;</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
index f321463..85682fa 100755 (executable)
@@ -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
index 4b82631..76d2d08 100644 (file)
@@ -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)
index 95bdaac..611fd4e 100755 (executable)
@@ -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"