summaryrefslogtreecommitdiff
path: root/test/lib/common.inc
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2015-09-23 23:44:14 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2015-09-23 23:44:14 -0300
commit72f7c0bdab559cb84efcf049d983ee2b1bb9bc2c (patch)
tree76de125e6b30022cff818b232f2b17f8216c2a5e /test/lib/common.inc
parent975660674e48954b1f96cb489a232181b85a4928 (diff)
remove deprecated sources_pool and packages_pool variables
Diffstat (limited to 'test/lib/common.inc')
-rw-r--r--test/lib/common.inc36
1 files changed, 18 insertions, 18 deletions
diff --git a/test/lib/common.inc b/test/lib/common.inc
index f43d531..9ccf1c8 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -60,7 +60,7 @@ setUp() {
#msg "Using ${temporary_directory}"
repositories=('core' 'extra' 'testing')
- packages_pool='pool/packages'
+ native_packages_pool='pool/packages'
mkdir -p "${temporary_directory}/"{ftp,tmp,staging,{package,source}-cleanup,svn-packages-{copy,repo}}
for r in ${repositories[@]}; do
@@ -69,8 +69,8 @@ setUp() {
mkdir -p "${temporary_directory}/ftp/${r}/os/${a}"
done
done
- mkdir -p "${temporary_directory}/ftp/${packages_pool}"
- mkdir -p "${temporary_directory}/ftp/${sources_pool}"
+ mkdir -p "${temporary_directory}/ftp/${native_packages_pool}"
+ mkdir -p "${temporary_directory}/ftp/${native_sources_pool}"
msg 'Creating svn repository...'
svnadmin create "${temporary_directory}/svn-packages-repo"
@@ -88,7 +88,7 @@ setUp() {
root_dir="${temporary_directory}/ftp"
SVN_repository="file://${temporary_directory}/svn-packages-repo"
repositories=(${repositories[@]})
- packages_pool="${packages_pool}"
+ native_packages_pool="${native_packages_pool}"
cleanup_destination_directory="${temporary_directory}/package-cleanup"
source_cleanup_destination_directory="${temporary_directory}/source-cleanup"
staging_directory="${temporary_directory}/staging"
@@ -131,20 +131,20 @@ checkAnyPackageDB() {
local arch
local db
- [ -r "${root_dir}/${packages_pool}/${pkg}" ] || fail "${packages_pool}/${pkg} not found"
+ [ -r "${root_dir}/${native_packages_pool}/${pkg}" ] || fail "${native_packages_pool}/${pkg} not found"
if ${require_signature}; then
- [ -r "${root_dir}/${packages_pool}/${pkg}.sig" ] || fail "${packages_pool}/${pkg}.sig not found"
+ [ -r "${root_dir}/${native_packages_pool}/${pkg}.sig" ] || fail "${native_packages_pool}/${pkg}.sig not found"
fi
for arch in i686 x86_64; do
[ -L "${root_dir}/${repo}/os/${arch}/${pkg}" ] || fail "${repo}/os/${arch}/${pkg} is not a symlink"
- [ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${packages_pool}/${pkg}" ] \
- || fail "${repo}/os/${arch}/${pkg} does not link to ${packages_pool}/${pkg}"
+ [ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${native_packages_pool}/${pkg}" ] \
+ || fail "${repo}/os/${arch}/${pkg} does not link to ${native_packages_pool}/${pkg}"
if ${require_signature}; then
[ -L "${root_dir}/${repo}/os/${arch}/${pkg}.sig" ] || fail "${repo}/os/${arch}/${pkg}.sig is not a symlink"
- [ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${packages_pool}/${pkg}.sig" ] \
- || fail "${repo}/os/${arch}/${pkg}.sig does not link to ${packages_pool}/${pkg}.sig"
+ [ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${native_packages_pool}/${pkg}.sig" ] \
+ || fail "${repo}/os/${arch}/${pkg}.sig does not link to ${native_packages_pool}/${pkg}.sig"
fi
done
[ -r "${staging_directory}"/${repo}/${pkg} ] && fail "${repo}/${pkg} found in staging directory"
@@ -166,7 +166,7 @@ checkAnyPackage() {
checkAnyPackageDB $repo $pkg
- local pkgbase=$(getpkgbase "${root_dir}/${packages_pool}/${pkg}")
+ local pkgbase=$(getpkgbase "${root_dir}/${native_packages_pool}/${pkg}")
svn up -q "${temporary_directory}/svn-packages-copy/${pkgbase}"
[ -d "${temporary_directory}/svn-packages-copy/${pkgbase}/repos/${repo}-any" ] \
|| fail "svn-packages-copy/${pkgbase}/repos/${repo}-any does not exist"
@@ -178,20 +178,20 @@ checkPackageDB() {
local arch=$3
local db
- [ -r "${root_dir}/${packages_pool}/${pkg}" ] || fail "${packages_pool}/${pkg} not found"
+ [ -r "${root_dir}/${native_packages_pool}/${pkg}" ] || fail "${native_packages_pool}/${pkg} not found"
[ -L "${root_dir}/${repo}/os/${arch}/${pkg}" ] || fail "${repo}/os/${arch}/${pkg} not a symlink"
[ -r "${staging_directory}"/${repo}/${pkg} ] && fail "${repo}/${pkg} found in staging directory"
- [ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${packages_pool}/${pkg}" ] \
- || fail "${repo}/os/${arch}/${pkg} does not link to ${packages_pool}/${pkg}"
+ [ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${native_packages_pool}/${pkg}" ] \
+ || fail "${repo}/os/${arch}/${pkg} does not link to ${native_packages_pool}/${pkg}"
if ${require_signature}; then
- [ -r "${root_dir}/${packages_pool}/${pkg}.sig" ] || fail "${packages_pool}/${pkg}.sig not found"
+ [ -r "${root_dir}/${native_packages_pool}/${pkg}.sig" ] || fail "${native_packages_pool}/${pkg}.sig not found"
[ -L "${root_dir}/${repo}/os/${arch}/${pkg}.sig" ] || fail "${repo}/os/${arch}/${pkg}.sig is not a symlink"
[ -r "${staging_directory}"/${repo}/${pkg}.sig ] && fail "${repo}/${pkg}.sig found in staging directory"
- [ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${packages_pool}/${pkg}.sig" ] \
- || fail "${repo}/os/${arch}/${pkg}.sig does not link to ${packages_pool}/${pkg}.sig"
+ [ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${native_packages_pool}/${pkg}.sig" ] \
+ || fail "${repo}/os/${arch}/${pkg}.sig does not link to ${native_packages_pool}/${pkg}.sig"
fi
for db in ${database_extension_suffixfile} ${files_extension_suffixfile}; do
@@ -208,7 +208,7 @@ checkPackage() {
checkPackageDB $repo $pkg $arch
- local pkgbase=$(getpkgbase "${root_dir}/${packages_pool}/${pkg}")
+ local pkgbase=$(getpkgbase "${root_dir}/${native_packages_pool}/${pkg}")
svn up -q "${temporary_directory}/svn-packages-copy/${pkgbase}"
[ -d "${temporary_directory}/svn-packages-copy/${pkgbase}/repos/${repo}-${arch}" ] \
|| fail "svn-packages-copy/${pkgbase}/repos/${repo}-${arch} does not exist"