diff options
| author | Martin Willi <martin@revosec.ch> | 2013-03-22 11:30:59 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-03-26 10:31:29 +0100 |
| commit | b5f3c1f7854994dc2d26aba7e9eaf50fef6f7033 (patch) | |
| tree | 0653c8b8f9bf5e4a731a59e66cf4cb2d7f7fbd7a | |
| parent | 0ba884234805dead2bb2b06a386a9b1c818771d7 (diff) | |
| download | strongswan-b5f3c1f7854994dc2d26aba7e9eaf50fef6f7033.tar.bz2 strongswan-b5f3c1f7854994dc2d26aba7e9eaf50fef6f7033.tar.xz | |
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.
| -rwxr-xr-x | testing/do-tests | 1 | ||||
| -rwxr-xr-x | testing/scripts/load-testconfig | 1 | ||||
| -rwxr-xr-x | testing/scripts/restore-defaults | 1 | ||||
| -rwxr-xr-x | testing/ssh | 1 | ||||
| -rw-r--r-- | testing/testing.conf | 3 |
5 files changed, 4 insertions, 3 deletions
diff --git a/testing/do-tests b/testing/do-tests index f976e893f..d70c12c51 100755 --- 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 0ea4fbf00..2830780c4 100755 --- 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 953548a1b..173baf820 100755 --- 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 4777cfb47..95d064c15 100755 --- 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 89552de9c..e3bc5650c 100644 --- 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 # |