diff options
Diffstat (limited to 'test/test.d/pool-transition.sh')
| -rwxr-xr-x | test/test.d/pool-transition.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh index e91eed3..9f13d83 100755 --- a/test/test.d/pool-transition.sh +++ b/test/test.d/pool-transition.sh @@ -22,7 +22,7 @@ testMovePackagesWithoutPool() { # transform two packages to old style layout for arch in ${arches[@]}; do for old in 0 2; do - for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}${PKGEXT}; do + for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}${package_extension_suffixfile}; do pkg=$(basename $pkg) mv -f "${root_dir}/${PKGPOOL}/${pkg}" "${root_dir}/testing/os/${arch}/${pkg}" done @@ -37,7 +37,7 @@ testMovePackagesWithoutPool() { for pkgbase in ${pkgs[@]}; do for arch in ${arches[@]}; do - for pkg in "${pkgdir}/${pkgbase}"/*-${arch}${PKGEXT}; do + for pkg in "${pkgdir}/${pkgbase}"/*-${arch}${package_extension_suffixfile}; do checkPackage extra $(basename ${pkg}) ${arch} done checkRemovedPackage testing ${pkgbase} ${arch} @@ -60,7 +60,7 @@ testUpdateAnyPackageWithoutPool() { ln -sf "../any/${pkg1}" "${root_dir}/extra/os/${arch}" done - pushd "${TMP}/svn-packages-copy/${pkgname}/trunk/" >/dev/null + pushd "${temporary_directory}/svn-packages-copy/${pkgname}/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD svn commit -q -m"update pkg to pkgrel=2" >/dev/null sudo extra-i686-build >/dev/null 2>&1 @@ -94,7 +94,7 @@ testMoveAnyPackagesWithoutPool() { ../db-update # transform a package to old style layout - for pkg in "${pkgdir}/${pkgs[0]}"/*-any${PKGEXT}; do + for pkg in "${pkgdir}/${pkgs[0]}"/*-any${package_extension_suffixfile}; do pkg=$(basename $pkg) mv -f "${root_dir}/${PKGPOOL}/${pkg}" "${root_dir}/testing/os/any/${pkg}" for arch in i686 x86_64; do @@ -109,13 +109,13 @@ testMoveAnyPackagesWithoutPool() { ../cron-jobs/ftpdir-cleanup >/dev/null for pkgbase in ${pkgs[@]}; do - for pkg in "${pkgdir}/${pkgbase}"/*-any${PKGEXT}; do + for pkg in "${pkgdir}/${pkgbase}"/*-any${package_extension_suffixfile}; do checkAnyPackage extra $(basename ${pkg}) done checkRemovedAnyPackage testing ${pkgbase} done - for pkg in "${pkgdir}/${pkgs[0]}"/*-any${PKGEXT}; do + for pkg in "${pkgdir}/${pkgs[0]}"/*-any${package_extension_suffixfile}; do pkg=$(basename $pkg) for arch in any i686 x86_64; do [ -f "${root_dir}/testing/os/${arch}/${pkg}" ] && fail "testing/os/${arch}/${pkg} found" @@ -131,7 +131,7 @@ testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() { ../db-update # transform a package to old style layout - for pkg in "${pkgdir}/pkg-any-a"/*-any${PKGEXT}; do + for pkg in "${pkgdir}/pkg-any-a"/*-any${package_extension_suffixfile}; do pkg=$(basename $pkg) mv -f "${root_dir}/${PKGPOOL}/${pkg}" "${root_dir}/extra/os/any/${pkg}" for arch in i686 x86_64; do @@ -143,9 +143,9 @@ testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() { ../db-update >/dev/null 2>&1 && (fail 'Adding an existing package to another repository should fail'; return 1) for arch in i686 x86_64; do - ( [ -r "${root_dir}/testing/os/${arch}/testing${DBEXT%.tar.*}" ] \ - && bsdtar -xf "${root_dir}/testing/os/${arch}/testing${DBEXT%.tar.*}" -O | grep -q pkg-any-a) \ - && fail "pkg-any-a should not be in testing/os/${arch}/testing${DBEXT%.tar.*}" + ( [ -r "${root_dir}/testing/os/${arch}/testing${database_extension_suffixfile%.tar.*}" ] \ + && bsdtar -xf "${root_dir}/testing/os/${arch}/testing${database_extension_suffixfile%.tar.*}" -O | grep -q pkg-any-a) \ + && fail "pkg-any-a should not be in testing/os/${arch}/testing${database_extension_suffixfile%.tar.*}" done } |