diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2017-04-18 22:25:36 +0200 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2018-04-06 13:51:50 -0400 |
| commit | d5011f051c5de5038c3525584472e321ff96623c (patch) | |
| tree | 05fee501828f0b58a15b360e7db098205b5a9d8b | |
| parent | 410d5f1d2c537850113c9ab3710d151c00ac70c1 (diff) | |
Move package build and update functions to common library
(cherry picked from commit 51aa6217229ad9164122e904b184c673db190216)
| -rwxr-xr-x | test/cases/db-update.bats | 19 | ||||
| -rw-r--r-- | test/lib/common.bash | 28 |
2 files changed, 32 insertions, 15 deletions
diff --git a/test/cases/db-update.bats b/test/cases/db-update.bats index 99c30e0..bd32b94 100755 --- a/test/cases/db-update.bats +++ b/test/cases/db-update.bats @@ -74,11 +74,7 @@ load ../lib/common releasePackage extra pkg-any-a any db-update - pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null - sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD - svn commit -q -m"update pkg to pkgrel=2" >/dev/null - __buildPackage any - popd >/dev/null + updatePackage pkg-any-a any releasePackage extra pkg-any-a any db-update @@ -89,11 +85,7 @@ load ../lib/common @test "update any package to different repositories at once" { releasePackage extra pkg-any-a any - pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null - sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD - svn commit -q -m"update pkg to pkgrel=2" >/dev/null - __buildPackage any - popd >/dev/null + updatePackage pkg-any-a any releasePackage testing pkg-any-a any @@ -215,14 +207,11 @@ load ../lib/common checkRemovedPackage extra 'foo-pkg-simple-a-1-1-i686.pkg.tar.xz' 'i686' } -@test "add package with inconsistent svn fails" { +@test "add package with inconsistent pkgbuild fails" { skip # abslibre is broken releasePackage extra 'pkg-simple-a' 'i686' - pushd "${TMP}/svn-packages-copy/pkg-simple-a/repos/extra-i686" >/dev/null - sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD - svn commit -q -m"update pkg to pkgrel=2" >/dev/null - popd >/dev/null + updateRepoPKGBUILD 'pkg-simple-a' extra i686 ! db-update >/dev/null 2>&1 checkRemovedPackage extra 'pkg-simple-a-1-1-i686.pkg.tar.xz' 'i686' diff --git a/test/lib/common.bash b/test/lib/common.bash index 5843e50..936c7c5 100644 --- a/test/lib/common.bash +++ b/test/lib/common.bash @@ -149,6 +149,34 @@ __buildPackage() { done } +__updatePKGBUILD() { + local pkgrel + + pkgrel=$(. PKGBUILD; expr ${pkgrel} + 1) + sed "s/pkgrel=.*/pkgrel=${pkgrel}/" -i PKGBUILD + svn commit -q -m"update pkg to pkgrel=${pkgrel}" >/dev/null +} + +updatePackage() { + local pkgbase=$1 + local arch=$2 + + pushd "${TMP}/svn-packages-copy/${pkgbase}/trunk/" >/dev/null + __updatePKGBUILD + __buildPackage ${arch} + popd >/dev/null +} + +updateRepoPKGBUILD() { + local pkgbase=$1 + local repo=$2 + local arch=$3 + + pushd "${TMP}/svn-packages-copy/${pkgbase}/repos/${repo}-${arch}/" >/dev/null + __updatePKGBUILD + popd >/dev/null +} + getPackageNamesFromPackageBase() { local pkgbase=$1 |