Import testing.conf file in function.sh

This is needed to have access to $LOGFILE and possibly other config
settings.
This commit is contained in:
Reto Buerki
2013-01-17 15:22:10 +01:00
committed by Tobias Brunner
parent 261cf0e395
commit 7c2ef58e86
10 changed files with 26 additions and 72 deletions
+2 -7
View File
@@ -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"