aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Maxwell <keith.maxwell@gmail.com>2020-05-08 15:13:54 +0100
committerLeo <thinkabit.ukim@gmail.com>2020-05-15 02:07:10 +0000
commitb34014637ea8d2caf92609d5e245ae0099ad5a88 (patch)
tree134bb988351f502037c8a232ecf34dd238f157b4
parent109acf488d8a5b369d9fb7dda89466027377f6f5 (diff)
downloadaports-b34014637ea8d2caf92609d5e245ae0099ad5a88.tar.gz
aports-b34014637ea8d2caf92609d5e245ae0099ad5a88.tar.bz2
aports-b34014637ea8d2caf92609d5e245ae0099ad5a88.tar.xz
main/mercurial: upgrade to 5.4
Also enable check() to run approximately 730 of the 919 tests on all arches apart from armv7. On armv7 in CI around 400 more tests time out, so this commit does not not enable the test suite.
-rw-r--r--main/mercurial/APKBUILD16
-rw-r--r--main/mercurial/blacklist.txt110
2 files changed, 123 insertions, 3 deletions
diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD
index 1248de41e9..9ec93e6c46 100644
--- a/main/mercurial/APKBUILD
+++ b/main/mercurial/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mercurial
-pkgver=5.3.2
+pkgver=5.4
pkgrel=0
pkgdesc="Scalable distributed SCM tool"
url="https://www.mercurial-scm.org"
@@ -9,13 +9,18 @@ arch="all"
license="GPL-2.0-or-later"
depends="python3"
makedepends="python3-dev"
+checkdepends="unzip diffutils xz sqlite gettext py3-docutils"
subpackages="
$pkgname-doc
$pkgname-vim:vim:noarch
$pkgname-zsh-completion:zshcomp:noarch
$pkgname-bash-completion:bashcomp:noarch
"
-source="https://www.mercurial-scm.org/release/mercurial-$pkgver.tar.gz"
+source="https://www.mercurial-scm.org/release/mercurial-$pkgver.tar.gz
+ blacklist.txt"
+case "$CARCH" in
+ armv7) options="$options !check" ;; # around 400 of 919 tests time out
+esac
# secfixes:
# 4.9-r0:
@@ -25,6 +30,10 @@ build() {
HGPYTHON3=1 python3 setup.py build
}
+check() {
+ make PYTHON=python3 TESTFLAGS=--blacklist="$srcdir/blacklist.txt" tests
+}
+
package() {
HGPYTHON3=1 python3 setup.py install --root="$pkgdir"
install -m755 contrib/hgk contrib/hg-ssh hgeditor "$pkgdir"/usr/bin
@@ -65,4 +74,5 @@ bashcomp() {
"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
}
-sha512sums="b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99 mercurial-5.3.2.tar.gz"
+sha512sums="5f92d653ab74da4696ba7f1402e6cb219c0c514a5eeecb9d7282ab95aef2c6f16d5c8e3d0149525f3dc694a133c713b671ba92327e1b0dc3ad8701d522986d8d mercurial-5.4.tar.gz
+5fcbfed5ba4f48550f50eeaab92e3f6d17bc6b2c26ad0aca6f12e238d4f8f3291810d6f215a4e5b22b96d7b0841e250eb19301eb71487803f878b82c00daac2b blacklist.txt"
diff --git a/main/mercurial/blacklist.txt b/main/mercurial/blacklist.txt
new file mode 100644
index 0000000000..ee77c539ac
--- /dev/null
+++ b/main/mercurial/blacklist.txt
@@ -0,0 +1,110 @@
+test-doctest.py # abort: no repository found...; expected
+test-lfs-test-server.t # object is corrupt
+test-hardlinks.t # 2 instead of 1
+test-persistent-nodemap.t # unclear
+test-debugcommands.t # "
+test-nointerrupt.t # "
+test-wireproto-exchangev2-shallow.t # ordering of output
+# fail with an error about address is use or unavailable
+test-clonebundles.t
+test-http-bad-server.t
+test-http-bundle1.t
+test-http-proxy.t
+test-http.t
+test-https.t
+test-lfs-serve-access.t
+# time out on x86_64 or x86
+test-bookmarks-pushpull.t
+test-fix.t
+test-glog-beautifygraph.t
+test-glog.t
+test-import.t
+test-largefiles-misc.t
+test-largefiles.t
+test-log.t
+test-merge-combination.t
+test-mq.t
+test-narrow-shallow.t
+test-obsmarker-template.t
+test-obsolete-bundle-strip.t
+test-obsolete.t
+test-rebase-obsolete.t
+test-revset.t
+test-subrepo.t
+test-template-functions.t
+# time out on ppc64le
+test-annotate.t
+test-automv.t
+test-backout.t
+test-bisect.t
+test-bisect2.t
+test-bookmarks.t
+test-branches.t
+test-bundle2-exchange.t
+test-censor.t
+test-clone.t
+test-commit-amend.t
+test-commit-interactive.t
+test-commit.t
+test-convert-filemap.t
+test-copies-chain-merge.t
+test-copies-unrelated.t
+test-copies.t
+test-copytrace-heuristics.t
+test-fileset.t
+test-graft-interrupted.t
+test-graft.t
+test-help.t
+test-hook.t
+test-http-permissions.t
+test-init.t
+test-keyword.t
+test-largefiles-update.t
+test-lfs.t
+test-merge-changedelete.t
+test-merge-force.t
+test-merge-tools.t
+test-mq-guards.t
+test-mq-header-date.t
+test-mq-header-from.t
+test-mq-qpush-exact.t
+test-mq-subrepo.t
+test-mv-cp-st-diff.t
+test-narrow-clone.t
+test-narrow-share.t
+test-narrow.t
+test-obsolete-divergent.t
+test-phases-exchange.t
+test-push-race.t
+test-push-warn.t
+test-rebase-inmemory.t
+test-rebase-scenario-global.t
+test-remotefilelog-local.t
+test-rename-merge2.t
+test-resolve.t
+test-revert.t
+test-revset2.t
+test-run-tests.t
+test-shelve.t
+test-shelve2.t
+test-show-work.t
+test-ssh-proto.t
+test-strip.t
+test-subrepo-deep-nested-change.t
+test-subrepo-git.t
+test-tag.t
+test-tags.t
+test-template-basic.t
+test-template-keywords.t
+test-template-map.t
+test-transplant.t
+test-treemanifest.t
+test-uncommit.t
+test-update-branches.t
+# timed out on aarch64
+test-clone-uncompressed.t
+test-lock-badness.t
+test-narrow-clone-no-ellipsis.t
+test-narrow-pull.t
+test-remotefilelog-prefetch.t
+test-rename.t