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.

diff --git a/testing/do-tests b/testing/do-tests
index f976e893f11962372bedab09464e97fe30ac82fb..d70c12c51eb6fffa5548c2aa50f99a4f2b9931ac 100755 (executable)
--- a/testing/do-tests
+++ b/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"

diff --git a/testing/scripts/load-testconfig b/testing/scripts/load-testconfig
index 0ea4fbf0025d410a7a12ac73c91c812687631f50..2830780c458189d3b70d9a7059a222c2a7681cb9 100755 (executable)
--- a/testing/scripts/load-testconfig
+++ b/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

diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults
index 953548a1b599cde3d5129954d7878717a853112b..173baf820a03cd016a1795cfd5d56cbaa8d1b0e6 100755 (executable)
--- a/testing/scripts/restore-defaults
+++ b/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
 

diff --git a/testing/ssh b/testing/ssh
index 4777cfb4794006a0b282809296b04988f5c57298..95d064c157985d10776e726ecc2bd7327f87e8e2 100755 (executable)
--- a/testing/ssh
+++ b/testing/ssh
@@ -2,6 +2,7 @@
 
 DIR=$(dirname `readlink -f $0`)
 . $DIR/testing.conf
+SSHCONF="-F $DIR/ssh_config"
 
 if [ $# == 0 ]
 then

diff --git a/testing/testing.conf b/testing/testing.conf
index 89552de9c00e28d75b7e737a168818ed188460b7..e3bc5650c98726e96c5f5fb4c013b0b46bf909c1 100644 (file)
--- a/testing/testing.conf
+++ b/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
 #