Define SSHCONF from strongswan testing directory, not TESTDIR

This fixes the use of SSHCONF in the ssh wrapper script before ./do-tests
had a chance to create the required symlinks.

testing/do-tests

@@ -17,6 +17,7 @@
 DIR=$(dirname `readlink -f $0`)
 . $DIR/testing.conf
 . $DIR/scripts/function.sh
+SSHCONF="-F $DIR/ssh_config"
 
 [ -d $DIR/hosts ] || die "Directory 'hosts' not found"
 [ -d $DIR/tests ] || die "Directory 'tests' not found"

testing/scripts/load-testconfig

@@ -17,6 +17,7 @@
 DIR=$(dirname `readlink -f $0`)
 . $DIR/../testing.conf
 . $DIR/function.sh
+SSHCONF="-F $DIR/../ssh_config"
 
 ##########################################################################
 # load-testconfig requires a testname as an argument

testing/scripts/restore-defaults

@@ -17,6 +17,7 @@
 DIR=$(dirname `readlink -f $0`)
 . $DIR/../testing.conf
 . $DIR/function.sh
+SSHCONF="-F $DIR/../ssh_config"
 
 testname=$1
 

testing/ssh

@@ -2,6 +2,7 @@
 
 DIR=$(dirname `readlink -f $0`)
 . $DIR/testing.conf
+SSHCONF="-F $DIR/ssh_config"
 
 if [ $# == 0 ]
 then

testing/testing.conf

@@ -65,9 +65,6 @@ KVMGROUP=kvm
 # Directory where test results will be stored
 TESTRESULTSDIR=$TESTDIR/testresults
 
-# SSH configuration (speedup SSH)
-SSHCONF="-F $TESTDIR/testing/ssh_config"
-
 ##############################################################
 # Enable particular steps in the make-testing
 #