Rename UMLTESTDIR variable to TESTDIR

diff --git a/testing/do-tests b/testing/do-tests
index 44b5f2dcaa4cf7aeadbb6fba6e8ae157899f50f9..7f7d9147a6edde468ab0482bfd084e706d511bfe 100755 (executable)
--- a/testing/do-tests
+++ b/testing/do-tests
@@ -35,7 +35,7 @@ TODAYDIR=$TESTRESULTSDIR/$TESTDATE
 mkdir $TODAYDIR
 TESTRESULTSHTML=$TODAYDIR/all.html
 INDEX=$TODAYDIR/index.html
-DEFAULTTESTSDIR=$UMLTESTDIR/testing/tests
+DEFAULTTESTSDIR=$TESTDIR/testing/tests
 
 SOURCEIP_ROUTING_TABLE=220
 

diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs
index 2ed8b504a5bc0450ed66b457dd07e8429b50c9c1..9c419ac9b05eb9d009aa55efa933d080380affb2 100755 (executable)
--- a/testing/scripts/build-umlhostfs
+++ b/testing/scripts/build-umlhostfs
@@ -48,7 +48,7 @@ do
        if [ "$host" = "winnetou" ]
        then
                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 "/etc/openssl/generate-crl" 0
                execute_chroot "update-rc.d apache2 defaults" 0

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index 271e532d42477da4270eddd9f1662d4c0e03054f..cf11844ce9898695926e80996af7353dd19bee9c 100755 (executable)
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -45,7 +45,7 @@ do_on_exit umount $LOOPDIR/proc
 do_on_exit umount $LOOPDIR
 
 echo "Installing software from source"
-RECPDIR=$UMLTESTDIR/testing/scripts/recipes
+RECPDIR=$TESTDIR/testing/scripts/recipes
 RECIPES=`ls $RECPDIR/*.mk | xargs -n1 basename`
 execute "cp -r $RECPDIR/patches $LOOPDIR/root/compile" 0
 for r in $RECIPES

diff --git a/testing/testing.conf b/testing/testing.conf
index c7defbc6a3cf151377392c0c2f1c7d5f0714cf7b..1eb510878ebcf20a666cd3a346482b46398ec3ac 100644 (file)
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -15,7 +15,7 @@
 # for more details.
 
 # Root directory of testing
-UMLTESTDIR=~/strongswan-testing
+TESTDIR=~/strongswan-testing
 
 # Kernel configuration
 KERNELVERSION=3.5.3
@@ -28,7 +28,7 @@ KERNELPATCH=ha-3.0.patch.bz2
 SWANVERSION=5.0.2dr4
 
 # Directory where the UML kernels and file system will be built
-BUILDDIR=$UMLTESTDIR/umlbuild
+BUILDDIR=$TESTDIR/umlbuild
 
 # Logfile
 LOGFILE=$BUILDDIR/testing.log
@@ -54,10 +54,10 @@ VIRTIMGSTORE=/var/lib/libvirt/images
 UMLKERNEL=$BUILDDIR/linux-uml-$KERNELVERSION
 
 # Directory where test results will be stored
-TESTRESULTSDIR=$UMLTESTDIR/testresults
+TESTRESULTSDIR=$TESTDIR/testresults
 
 # 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!
 TZUML="Europe/Zurich"