diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-09-23 19:49:47 -0300 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-09-23 19:49:47 -0300 |
commit | 13b98e9182bad88e91e2a6d663e79499cf7263e8 (patch) | |
tree | 2655120abc30474011c6bdc332634a82d2db6abe /test/lib/common.inc | |
parent | dcb06b94399279fa6ccc09cfda5451bc267a9b57 (diff) |
fix sources
Diffstat (limited to 'test/lib/common.inc')
-rw-r--r-- | test/lib/common.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/lib/common.inc b/test/lib/common.inc index c549ac9..1121724 100644 --- a/test/lib/common.inc +++ b/test/lib/common.inc @@ -1,7 +1,7 @@ set -E -. "$(dirname ${BASH_SOURCE[0]})/../../config" -. "$(dirname ${BASH_SOURCE[0]})/../../db-functions" +source "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.cfg" +source "$(dirname ${BASH_SOURCE[0]})/../../share/db-functions" oneTimeSetUp() { local p @@ -55,7 +55,7 @@ setUp() { local r local a - [ -f "$(dirname ${BASH_SOURCE[0]})/../../config.local" ] && die "$(dirname ${BASH_SOURCE[0]})/../../config.local exists" + [ -f "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg" ] && die "$(dirname ${BASH_SOURCE[0]})/../../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]})/../../config.local" + cat <<eot > "$(dirname ${BASH_SOURCE[0]})/../../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]})/../../config" + . "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.cfg" } tearDown() { rm -rf "${temporary_directory}" - rm -f "$(dirname ${BASH_SOURCE[0]})/../../config.local" + rm -f "$(dirname ${BASH_SOURCE[0]})/../../dbscripts.local.cfg" echo } |