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 /testing/scripts | |
| 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.
Diffstat (limited to 'testing/scripts')
| -rwxr-xr-x | testing/scripts/load-testconfig | 1 | ||||
| -rwxr-xr-x | testing/scripts/restore-defaults | 1 |
2 files changed, 2 insertions, 0 deletions
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 |