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

Rename UMLTESTDIR variable to TESTDIR

Browse Source
This commit is contained in:
Reto Buerki
2013-01-17 16:54:53 +01:00
committed by Tobias Brunner
parent 36a3fe90d8
commit bf48ee33e5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/do-tests
+1 -1
View File
@@ -35,7 +35,7 @@ TODAYDIR=$TESTRESULTSDIR/$TESTDATE
mkdir $TODAYDIR mkdir $TODAYDIR
TESTRESULTSHTML=$TODAYDIR/all.html TESTRESULTSHTML=$TODAYDIR/all.html
INDEX=$TODAYDIR/index.html INDEX=$TODAYDIR/index.html
DEFAULTTESTSDIR=$UMLTESTDIR/testing/tests DEFAULTTESTSDIR=$TESTDIR/testing/tests
SOURCEIP_ROUTING_TABLE=220 SOURCEIP_ROUTING_TABLE=220
testing/scripts/build-umlhostfs
+1 -1
View File
@@ -48,7 +48,7 @@ do
if [ "$host" = "winnetou" ] if [ "$host" = "winnetou" ]
then then
execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0 execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0
execute "cp -rf $UMLTESTDIR/testing/images $LOOPDIR/var/www/" 0 execute "cp -rf $TESTDIR/testing/images $LOOPDIR/var/www/" 0
execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0 execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0
execute_chroot "/etc/openssl/generate-crl" 0 execute_chroot "/etc/openssl/generate-crl" 0
execute_chroot "update-rc.d apache2 defaults" 0 execute_chroot "update-rc.d apache2 defaults" 0
testing/scripts/build-umlrootfs
+1 -1
View File
@@ -45,7 +45,7 @@ do_on_exit umount $LOOPDIR/proc
do_on_exit umount $LOOPDIR do_on_exit umount $LOOPDIR
echo "Installing software from source" echo "Installing software from source"
RECPDIR=$UMLTESTDIR/testing/scripts/recipes RECPDIR=$TESTDIR/testing/scripts/recipes
RECIPES=`ls $RECPDIR/*.mk | xargs -n1 basename` RECIPES=`ls $RECPDIR/*.mk | xargs -n1 basename`
execute "cp -r $RECPDIR/patches $LOOPDIR/root/compile" 0 execute "cp -r $RECPDIR/patches $LOOPDIR/root/compile" 0
for r in $RECIPES for r in $RECIPES
testing/testing.conf
+4 -4
View File
@@ -15,7 +15,7 @@
# for more details. # for more details.
# Root directory of testing # Root directory of testing
UMLTESTDIR=~/strongswan-testing TESTDIR=~/strongswan-testing
# Kernel configuration # Kernel configuration
KERNELVERSION=3.5.3 KERNELVERSION=3.5.3
@@ -28,7 +28,7 @@ KERNELPATCH=ha-3.0.patch.bz2
SWANVERSION=5.0.2dr4 SWANVERSION=5.0.2dr4
# Directory where the UML kernels and file system will be built # Directory where the UML kernels and file system will be built
BUILDDIR=$UMLTESTDIR/umlbuild BUILDDIR=$TESTDIR/umlbuild
# Logfile # Logfile
LOGFILE=$BUILDDIR/testing.log LOGFILE=$BUILDDIR/testing.log
@@ -54,10 +54,10 @@ VIRTIMGSTORE=/var/lib/libvirt/images
UMLKERNEL=$BUILDDIR/linux-uml-$KERNELVERSION UMLKERNEL=$BUILDDIR/linux-uml-$KERNELVERSION
# Directory where test results will be stored # Directory where test results will be stored
TESTRESULTSDIR=$UMLTESTDIR/testresults TESTRESULTSDIR=$TESTDIR/testresults
# SSH configuration (speedup SSH) # SSH configuration (speedup SSH)
SSHCONF="-F $UMLTESTDIR/testing/ssh_config" SSHCONF="-F $TESTDIR/testing/ssh_config"
# Timezone for the UMLs, look in /usr/share/zoneinfo! # Timezone for the UMLs, look in /usr/share/zoneinfo!
TZUML="Europe/Zurich" TZUML="Europe/Zurich"