diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-06 18:26:39 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 15:22:10 +0100 |
| commit | 261cf0e395ec43634e49e3f431cd189d69f03edc (patch) | |
| tree | d3b94d24c6b8e178a8b8423e838e0f40eaf257e1 /testing/scripts/restore-defaults | |
| parent | 2d1577d661c02753ad7c9b34f993a7c340706679 (diff) | |
| download | strongswan-261cf0e395ec43634e49e3f431cd189d69f03edc.tar.bz2 strongswan-261cf0e395ec43634e49e3f431cd189d69f03edc.tar.xz | |
Drop build-hostconfig script
Use processed host configurations directly instead.
Diffstat (limited to 'testing/scripts/restore-defaults')
| -rwxr-xr-x | testing/scripts/restore-defaults | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults index 64cc0262e..6bad3c5f0 100755 --- a/testing/scripts/restore-defaults +++ b/testing/scripts/restore-defaults @@ -16,11 +16,10 @@ DIR=`dirname $0` -source $DIR/function.sh +. $DIR/function.sh [ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found" - -source $DIR/../testing.conf +. $DIR/../testing.conf ########################################################################## # load-testconfig requires a testname as an argument @@ -28,7 +27,7 @@ source $DIR/../testing.conf testname=$1 -HOSTCONFIGDIR=$BUILDDIR/hosts +HOSTCONFIGDIR=$DIR/../hosts TESTSDIR=$BUILDDIR/tests [ -d $TESTSDIR ] || die "Directory '$TESTSDIR' not found" |