ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

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.
This commit is contained in:
Martin Willi 2013-03-22 11:30:59 +01:00
parent 0ba8842348
commit b5f3c1f785
5 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testing/do-tests
View File

@ -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"

1
testing/scripts/load-testconfig
View File

@ -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

1
testing/scripts/restore-defaults
View File

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

1
testing/ssh
View File

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

3
testing/testing.conf
View File

@ -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
#