diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-12 19:30:34 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-12 19:33:13 -0600 |
| commit | 86aeadb4c3d56f168e0bce34e0e2fa06c1ccb78b (patch) | |
| tree | a0f070afe590dc28662188f2e86ca0d4ce6bcd89 /test | |
| parent | 0992cc36f525898ff07032d0ee697ecb62fedc07 (diff) | |
test/: use libremakepkg instead of arch-*build
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/common.inc | 4 | ||||
| -rwxr-xr-x | test/test.d/db-update.sh | 4 | ||||
| -rwxr-xr-x | test/test.d/testing2x.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/lib/common.inc b/test/lib/common.inc index aeceece..be039fa 100644 --- a/test/lib/common.inc +++ b/test/lib/common.inc @@ -46,10 +46,10 @@ oneTimeSetUp() { if ! ${build}; then if [ "${pkgarch[0]}" == 'any' ]; then - sudo extra-x86_64-build || die 'extra-x86_64-build failed' + sudo libremakepkg || die 'libremakepkg failed' else for a in ${pkgarch[@]}; do - sudo extra-${a}-build || die "extra-${a}-build failed" + sudo setarch $a libremakepkg -n $a || die "setarch ${a} libremakepkg -n ${a} failed" done fi for a in ${pkgarch[@]}; do diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh index 7a5ce4c..4b3008e 100755 --- a/test/test.d/db-update.sh +++ b/test/test.d/db-update.sh @@ -82,7 +82,7 @@ testUpdateAnyPackage() { pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD arch_svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build + sudo libremakepkg mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/" popd >/dev/null @@ -100,7 +100,7 @@ testUpdateAnyPackageToDifferentRepositoriesAtOnce() { pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD arch_svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build + sudo libremakepkg mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/" popd >/dev/null diff --git a/test/test.d/testing2x.sh b/test/test.d/testing2x.sh index 31d85b4..0c2fa83 100755 --- a/test/test.d/testing2x.sh +++ b/test/test.d/testing2x.sh @@ -10,7 +10,7 @@ testTesting2xAnyPackage() { pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD arch_svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build + sudo libremakepkg mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/" popd >/dev/null |