diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-06 19:03:45 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 15:22:10 +0100 |
| commit | 7c2ef58e86c10e0cf9846dc9211cc68c7e908f7f (patch) | |
| tree | a25052fa664b62f96b091855e9c1f08e9622701e /testing/scripts/restore-defaults | |
| parent | 261cf0e395ec43634e49e3f431cd189d69f03edc (diff) | |
| download | strongswan-7c2ef58e86c10e0cf9846dc9211cc68c7e908f7f.tar.bz2 strongswan-7c2ef58e86c10e0cf9846dc9211cc68c7e908f7f.tar.xz | |
Import testing.conf file in function.sh
This is needed to have access to $LOGFILE and possibly other config
settings.
Diffstat (limited to 'testing/scripts/restore-defaults')
| -rwxr-xr-x | testing/scripts/restore-defaults | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults index 6bad3c5f0..16714db26 100755 --- a/testing/scripts/restore-defaults +++ b/testing/scripts/restore-defaults @@ -14,12 +14,7 @@ # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. -DIR=`dirname $0` - -. $DIR/function.sh - -[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found" -. $DIR/../testing.conf +. $PWD/scripts/function.sh ########################################################################## # load-testconfig requires a testname as an argument @@ -27,7 +22,7 @@ DIR=`dirname $0` testname=$1 -HOSTCONFIGDIR=$DIR/../hosts +HOSTCONFIGDIR=$PWD/hosts TESTSDIR=$BUILDDIR/tests [ -d $TESTSDIR ] || die "Directory '$TESTSDIR' not found" |