From bf48ee33e568ee8456fa8324a39b11946f4628a6 Mon Sep 17 00:00:00 2001
From: Reto Buerki <reet@codelabs.ch>
Date: Fri, 7 Dec 2012 14:19:11 +0100
Subject: [PATCH] Rename UMLTESTDIR variable to TESTDIR

---
 testing/do-tests                | 2 +-
 testing/scripts/build-umlhostfs | 2 +-
 testing/scripts/build-umlrootfs | 2 +-
 testing/testing.conf            | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/testing/do-tests b/testing/do-tests
index 44b5f2dcaa..7f7d9147a6 100755
--- 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 2ed8b504a5..9c419ac9b0 100755
--- 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 271e532d42..cf11844ce9 100755
--- 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 c7defbc6a3..1eb510878e 100644
--- 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"