Rename UMLTESTDIR variable to TESTDIR

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"