From: Reto Buerki Date: Tue, 4 Dec 2012 17:46:21 +0000 (+0100) Subject: Adjust strongSwan version handling in HTML output X-Git-Tag: 5.0.2rc1~1^2~93 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beff82dd98c20570daf166b39cadcdf76a661e57;p=thirdparty%2Fstrongswan.git Adjust strongSwan version handling in HTML output --- diff --git a/testing/do-tests b/testing/do-tests index adc3e824fb..353cfa60e9 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 - +

- + - - + + - - + + - + @@ -170,9 +167,9 @@ cat > $TESTRESULTSHTML <<@EOF @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="Category:" + FIRST="Category" else FIRST=" " fi @@ -227,17 +224,17 @@ do

strongSwan UML Tests / $SUBDIR

strongSwan $SUBDIR Tests

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

- - + + - - + + - + @@ -746,10 +743,10 @@ cat >> $TESTRESULTSHTML << @EOF - + - +

UML kernel:	$KERNEL_VERSION		UML kernel	$KERNELVERSION
IPsec:	$IPSEC_VERSION		strongSwan	$SWANVERSION
Date:	Date	$TESTDATE

Passed:	$passed_cnt		Passed	$passed_cnt
Failed:	$failed_cnt		Failed	$failed_cnt

@@ -766,7 +763,7 @@ cat >> $INDEX << @EOF - Failed: + Failed $failed_cnt @@ -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 f321463db6..85682fa217 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 4b82631126..76d2d08826 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 95bdaac029..611fd4ea47 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"