From 13b98e9182bad88e91e2a6d663e79499cf7263e8 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 23 Sep 2015 19:49:47 -0300 Subject: fix sources --- test/lib/common.inc | 12 ++++++------ test/runTest | 2 +- test/test.d/create-filelists.sh | 4 ++-- test/test.d/db-move.sh | 4 ++-- test/test.d/db-remove.sh | 4 ++-- test/test.d/db-repo-add.sh | 4 ++-- test/test.d/db-repo-remove.sh | 4 ++-- test/test.d/db-update.sh | 4 ++-- test/test.d/ftpdir-cleanup.sh | 4 ++-- test/test.d/packages.sh | 4 ++-- test/test.d/pool-transition.sh | 4 ++-- test/test.d/signed-packages.sh | 4 ++-- test/test.d/sourceballs.sh | 4 ++-- test/test.d/testing2x.sh | 4 ++-- 14 files changed, 31 insertions(+), 31 deletions(-) (limited to 'test') 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 < "$(dirname ${BASH_SOURCE[0]})/../../config.local" + cat < "$(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 } diff --git a/test/runTest b/test/runTest index b8713d8..bb86983 100755 --- a/test/runTest +++ b/test/runTest @@ -1,6 +1,6 @@ #!/bin/bash -. "$(dirname ${BASH_SOURCE[0]})/lib/common.inc" +source "$(dirname ${BASH_SOURCE[0]})/lib/common.inc" for t in "$(dirname ${BASH_SOURCE[0]})/test.d/"*.sh; do l=$(basename ${t} .sh) diff --git a/test/test.d/create-filelists.sh b/test/test.d/create-filelists.sh index c1f43e9..b201eb2 100755 --- a/test/test.d/create-filelists.sh +++ b/test/test.d/create-filelists.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testCreateSimpleFileLists() { local arches=('i686' 'x86_64') @@ -102,4 +102,4 @@ testCleanupFileLists() { } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/db-move.sh b/test/test.d/db-move.sh index 04c8113..3445a46 100755 --- a/test/test.d/db-move.sh +++ b/test/test.d/db-move.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testMoveSimplePackages() { local arches=('i686' 'x86_64') @@ -119,4 +119,4 @@ testMoveSplitPackages() { checkRemovedAnyPackage testing pkg-split-a } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/db-remove.sh b/test/test.d/db-remove.sh index 416e693..8ec5bd6 100755 --- a/test/test.d/db-remove.sh +++ b/test/test.d/db-remove.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testRemovePackages() { local arches=('i686' 'x86_64') @@ -74,4 +74,4 @@ testRemoveAnyPackages() { done } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/db-repo-add.sh b/test/test.d/db-repo-add.sh index 7a201f9..01d53c4 100755 --- a/test/test.d/db-repo-add.sh +++ b/test/test.d/db-repo-add.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testAddSimplePackages() { local arches=('i686' 'x86_64') @@ -51,4 +51,4 @@ testAddMultiplePackages() { done } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/db-repo-remove.sh b/test/test.d/db-repo-remove.sh index 315d63d..45d2ef2 100755 --- a/test/test.d/db-repo-remove.sh +++ b/test/test.d/db-repo-remove.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testRemovePackages() { local arches=('i686' 'x86_64') @@ -55,4 +55,4 @@ testRemoveMultiplePackages() { done } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh index 3ce9037..08de911 100755 --- a/test/test.d/db-update.sh +++ b/test/test.d/db-update.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testAddSimplePackages() { local arches=('i686' 'x86_64') @@ -162,4 +162,4 @@ testAddIncompleteSplitPackage() { done } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/ftpdir-cleanup.sh b/test/test.d/ftpdir-cleanup.sh index 4e7e1f5..5ba7fb3 100755 --- a/test/test.d/ftpdir-cleanup.sh +++ b/test/test.d/ftpdir-cleanup.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testCleanupSimplePackages() { local arches=('i686' 'x86_64') @@ -118,4 +118,4 @@ testCleanupSplitPackages() { done } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/packages.sh b/test/test.d/packages.sh index 5028448..13877d2 100755 --- a/test/test.d/packages.sh +++ b/test/test.d/packages.sh @@ -1,11 +1,11 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testPackages() { # TODO: namcap -r sodepends fails with i686 packages find "${pkgdir}" -name "*${package_extension_suffixfile}" -exec namcap -e sodepends,pkgnameindesc {} + || fail 'namcap failed' } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh index 9f13d83..e74cf8b 100755 --- a/test/test.d/pool-transition.sh +++ b/test/test.d/pool-transition.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testMovePackagesWithoutPool() { local arches=('i686' 'x86_64') @@ -149,4 +149,4 @@ testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() { done } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/signed-packages.sh b/test/test.d/signed-packages.sh index d7c5e57..8293d8a 100755 --- a/test/test.d/signed-packages.sh +++ b/test/test.d/signed-packages.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testAddUnsignedPackage() { releasePackage extra 'pkg-simple-a' 'i686' @@ -10,4 +10,4 @@ testAddUnsignedPackage() { ../db-update >/dev/null 2>&1 && fail "db-update should fail when a signature is missing!" } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/sourceballs.sh b/test/test.d/sourceballs.sh index a34093a..d1adf1e 100755 --- a/test/test.d/sourceballs.sh +++ b/test/test.d/sourceballs.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testSourceballs() { local arches=('i686' 'x86_64') @@ -81,4 +81,4 @@ testSourceballsCleanup() { [ ! -r ${root_dir}/${SRCPOOL}/pkg-simple-b-*${source_extension_suffixfile} ] && fail "source package not found!" } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" diff --git a/test/test.d/testing2x.sh b/test/test.d/testing2x.sh index d0d08d5..a291ee3 100755 --- a/test/test.d/testing2x.sh +++ b/test/test.d/testing2x.sh @@ -1,7 +1,7 @@ #!/bin/bash curdir=$(readlink -e $(dirname $0)) -. "${curdir}/../lib/common.inc" +source "${curdir}/../lib/common.inc" testTesting2xAnyPackage() { releasePackage core pkg-any-a any @@ -24,4 +24,4 @@ testTesting2xAnyPackage() { checkRemovedAnyPackage testing pkg-any-a } -. "${curdir}/../lib/shunit2" +source "${curdir}/../lib/shunit2" -- cgit v1.2.3-54-g00ecf