diff options
| author | Florian Pritz <bluewind@xinu.at> | 2014-10-07 12:42:01 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-05-27 15:46:05 +0200 |
| commit | 1a57633f1d8e15f4b0ca48f2acacf6b67f74b573 (patch) | |
| tree | 0c1f6ba175f7ee4bdcb52d9bd7b9473e456d105a | |
| parent | 81023f6318b0257fd266585b34817dee46c37e35 (diff) | |
| download | dbscripts-1a57633f1d8e15f4b0ca48f2acacf6b67f74b573.tar.gz dbscripts-1a57633f1d8e15f4b0ca48f2acacf6b67f74b573.tar.xz | |
INCOMPLETE: make tests.d/db-update.sh work
This depends on my setup so it can call an adjusted archrelease. Needs
to be fixed properly.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
| -rw-r--r-- | db-functions | 4 | ||||
| -rw-r--r-- | test/lib/common.inc | 3 | ||||
| -rwxr-xr-x | test/test.d/db-update.sh | 7 |
3 files changed, 7 insertions, 7 deletions
diff --git a/db-functions b/db-functions index ca3e8e8..47053ea 100644 --- a/db-functions +++ b/db-functions @@ -634,8 +634,8 @@ get_file_from_pkgrepo() { # for git: cd $whereever; git show $tag:$filename #curl -s https://projects.archlinux.org/svntogit/community.git/plain/trunk/$filename?h=packages/$pkgbase # TODO: this requires us to restructure the repos - #arch_svn cat "${SVNREPO}/${_pkgbase}/tags/$tag/$filename" - arch_svn cat "${SVNREPO}/${_pkgbase}/trunk/$filename" + arch_svn cat "${SVNREPO}/${_pkgbase}/tags/$tag/$filename" + #arch_svn cat "${SVNREPO}/${_pkgbase}/trunk/$filename" } arch_svn() { diff --git a/test/lib/common.inc b/test/lib/common.inc index 554fb9a..4f5a5b4 100644 --- a/test/lib/common.inc +++ b/test/lib/common.inc @@ -138,7 +138,8 @@ releasePackage() { local pkgname pushd "${TMP}/svn-packages-copy"/${pkgbase}/trunk/ >/dev/null - archrelease ${repo}-${arch} >/dev/null 2>&1 + ~/git/arch/devtools/archrelease ${repo}-${arch} >/dev/null 2>&1 + # TODO: pull archrelease and commitpkg in dbscripts so this can be done cleaner? pkgver=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel})) pkgname=($(. PKGBUILD; echo ${pkgname[@]})) diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh index fa07077..5cee647 100755 --- a/test/test.d/db-update.sh +++ b/test/test.d/db-update.sh @@ -153,12 +153,11 @@ testAddIncompleteSplitPackage() { # remove a split package to make db-update fail rm "${STAGING}"/extra/${pkgbase}1-* - ../db-update >/dev/null 2>&1 && fail "db-update should fail when a split package is missing!" + # TODO: should this really not add any packages but exit 0? check against new specs + ../db-update for arch in ${arches[@]}; do - ( [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" ] \ - && bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" -O | grep -q ${pkgbase}) \ - && fail "${pkgbase} should not be in ${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" + checkRemovedPackage extra ${pkgbase} $arch done } |