diff options
Diffstat (limited to 'test/lib/common.inc')
| -rw-r--r-- | test/lib/common.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/lib/common.inc b/test/lib/common.inc index 1121724..781737a 100644 --- a/test/lib/common.inc +++ b/test/lib/common.inc @@ -1,6 +1,6 @@ set -E -source "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.cfg" +source "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.cfg" source "$(dirname ${BASH_SOURCE[0]})/../../share/db-functions" oneTimeSetUp() { @@ -55,7 +55,7 @@ setUp() { local r local a - [ -f "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg" ] && die "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg exists" + [ -f "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.local.cfg" ] && die "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.local.cfg exists" temporary_directory="$(mktemp -d /dev/shm/$(basename $0).XXXXXXXXXX)" #msg "Using ${temporary_directory}" @@ -84,7 +84,7 @@ setUp() { svn commit -q -m"initial commit of ${pkg}" "${temporary_directory}/svn-packages-copy" done - cat <<eot > "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg" + cat <<eot > "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.local.cfg" root_dir="${temporary_directory}/ftp" SVN_repository="file://${temporary_directory}/svn-packages-repo" PKGREPOS=(${PKGREPOS[@]}) @@ -97,12 +97,12 @@ setUp() { source_cleanup_dryrun=false require_signature=true eot - . "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.cfg" + . "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.cfg" } tearDown() { rm -rf "${temporary_directory}" - rm -f "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg" + rm -f "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.local.cfg" echo } |