From b5f3c1f7854994dc2d26aba7e9eaf50fef6f7033 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 22 Mar 2013 11:30:59 +0100 Subject: 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/scripts/load-testconfig | 1 + testing/scripts/restore-defaults | 1 + 2 files changed, 2 insertions(+) (limited to 'testing/scripts') 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 -- cgit v1.2.3