denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust strongSwan version handling in HTML output

Browse Source
This commit is contained in:
Reto Buerki
2013-01-17 15:22:08 +01:00
committed by Tobias Brunner
parent ffe710ae71
commit beff82dd98
4 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/do-tests
+23 -23
View File
@@ -114,25 +114,22 @@ done
# create header for the results html file # create header for the results html file
# #
KERNEL_VERSION=`basename $KERNEL .tar.bz2`
IPSEC_VERSION=`basename $STRONGSWAN .tar.bz2`
ENVIRONMENT_HEADER=$(cat <<@EOF ENVIRONMENT_HEADER=$(cat <<@EOF
<table border="0" cellspacing="2"> <table border="0" cellspacing="2" cellpadding="2">
<tr valign="top"> <tr valign="top">
<td><b>Host:</b></td> <td><b>Host</b></td>
<td colspan="3">`uname -a`</td> <td colspan="3">`uname -a`</td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td><b>UML kernel: &nbsp;</b></td> <td><b>UML kernel</b></td>
<td colspan="3">$KERNEL_VERSION</td> <td colspan="3">$KERNELVERSION</td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td><b>IPsec:</b></td> <td><b>strongSwan</b></td>
<td colspan="3">$IPSEC_VERSION</td> <td colspan="3">$SWANVERSION</td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td><b>Date:</b></td> <td><b>Date</b></td>
<td colspan="3">$TESTDATE</td> <td colspan="3">$TESTDATE</td>
</tr> </tr>
<tr> <tr>
@@ -170,9 +167,9 @@ cat > $TESTRESULTSHTML <<@EOF
</tr> </tr>
@EOF @EOF
cecho "UML kernel: $KERNEL_VERSION" cecho "UML kernel : $KERNELVERSION"
cecho "IPsec: $IPSEC_VERSION" cecho "strongSwan : $SWANVERSION"
cecho "Date: $TESTDATE" cecho "Date : $TESTDATE"
cecho "" cecho ""
@@ -208,7 +205,7 @@ do
mkdir $TODAYDIR/$SUBDIR mkdir $TODAYDIR/$SUBDIR
if [ $testnumber == 0 ] if [ $testnumber == 0 ]
then then
FIRST="<b>Category:</b>" FIRST="<b>Category</b>"
else else
FIRST="&nbsp;" FIRST="&nbsp;"
fi fi
@@ -227,17 +224,17 @@ do
<body> <body>
<div><a href="../index.html">strongSwan UML Tests</a> / $SUBDIR</div> <div><a href="../index.html">strongSwan UML Tests</a> / $SUBDIR</div>
<h2>strongSwan $SUBDIR Tests</h2> <h2>strongSwan $SUBDIR Tests</h2>
<table border="0" cellspacing="2"> <table border="0" cellspacing="2" cellpadding="2">
<tr valign="top"> <tr valign="top">
<td><b>UML kernel: &nbsp;</b></td> <td><b>UML kernel</b></td>
<td colspan="3">$KERNEL_VERSION</td> <td colspan="3">$KERNELVERSION</td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td><b>IPsec:</b></td> <td><b>strongSwan</b></td>
<td colspan="3">$IPSEC_VERSION</td> <td colspan="3">$SWANVERSION</td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td><b>Date:</b></td> <td><b>Date</b></td>
<td colspan="3">$TESTDATE</td> <td colspan="3">$TESTDATE</td>
</tr> </tr>
<tr> <tr>
@@ -746,10 +743,10 @@ cat >> $TESTRESULTSHTML << @EOF
<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td> <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
</tr> </tr>
<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>
<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> </tr>
</table> </table>
</body> </body>
@@ -766,7 +763,7 @@ cat >> $INDEX << @EOF
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td><b>Failed:</b></td> <td><b>Failed</b></td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td align="right"><b><font color="red">$failed_cnt</font></b></td> <td align="right"><b><font color="red">$failed_cnt</font></b></td>
<td>&nbsp;</td> <td>&nbsp;</td>
@@ -797,6 +794,9 @@ cecho ""
cecho "The results are available in $TODAYDIR" cecho "The results are available in $TODAYDIR"
cecho "or via the link http://$ipv4_winnetou/testresults/$TESTDATE" cecho "or via the link http://$ipv4_winnetou/testresults/$TESTDATE"
ENDDATE=`date +%Y%m%d-%H%M`
cecho ""
cecho "Finished: $ENDDATE"
########################################################################## ##########################################################################
# close ssh sessions # close ssh sessions
testing/scripts/build-umlrootfs
+2 -1
View File
@@ -75,7 +75,8 @@ for r in $RECIPES
do do
cecho-n " - $r.." cecho-n " - $r.."
cp $RECPDIR/$r ${LOOPDIR}/root/compile 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 if [ $? != 0 ]; then
cecho "failed" cecho "failed"
else else
testing/scripts/recipes/strongswan.mk
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/make #!/usr/bin/make
PV = 5.0.1 PV = $(SWANVERSION)
PKG = strongswan-$(PV) PKG = strongswan-$(PV)
TAR = $(PKG).tar.bz2 TAR = $(PKG).tar.bz2
SRC = http://download.strongswan.org/$(TAR) SRC = http://download.strongswan.org/$(TAR)
testing/testing.conf
+3
View File
@@ -30,6 +30,9 @@ KERNELCONFIG=$UMLTESTDIR/.config-3.5
# Bzipped uml patch for kernel # Bzipped uml patch for kernel
UMLPATCH=$UMLTESTDIR/ha-3.0.patch.bz2 UMLPATCH=$UMLTESTDIR/ha-3.0.patch.bz2
# strongSwan version used in tests
SWANVERSION=5.0.2dr4
# Amount of Memory to use per UML [MB]. # Amount of Memory to use per UML [MB].
# If "auto" is stated 1/12 of total host ram will be used. # If "auto" is stated 1/12 of total host ram will be used.
# Examples: MEM=64, MEM="128", MEM="auto" # Examples: MEM=64, MEM="128", MEM="auto"