From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AFC60138359 for ; Wed, 26 Aug 2020 11:45:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1E4DE08C8; Wed, 26 Aug 2020 11:45:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C94EE08C8 for ; Wed, 26 Aug 2020 11:45:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C2D2335D11 for ; Wed, 26 Aug 2020 11:45:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 547CD32E for ; Wed, 26 Aug 2020 11:45:09 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1598442269.73b2695d16c80a3bdb84e3edaf3289089ad7f60a.nicolasbock@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/neomutt/Manifest mail-client/neomutt/neomutt-20200626-r1.ebuild X-VCS-Directories: mail-client/neomutt/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 73b2695d16c80a3bdb84e3edaf3289089ad7f60a X-VCS-Branch: master Date: Wed, 26 Aug 2020 11:45:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8a11ee16-553c-4e27-a117-f694363727c0 X-Archives-Hash: 71f9607a9586357525f73827a587caa6 commit: 73b2695d16c80a3bdb84e3edaf3289089ad7f60a Author: Nicolas Bock gentoo org> AuthorDate: Tue Jul 28 18:07:51 2020 +0000 Commit: Nicolas Bock gentoo org> CommitDate: Wed Aug 26 11:44:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73b2695d mail-client/neomutt: Add unit tests This change addds unit tests to neomutt. Those tests come from a separate repository. Closes: https://bugs.gentoo.org/734122 Closes: https://bugs.gentoo.org/728886 Signed-off-by: Nicolas Bock gentoo.org> mail-client/neomutt/Manifest | 1 + mail-client/neomutt/neomutt-20200626-r1.ebuild | 51 +++++++++++++++++--------- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest index 10ccd55623e..c00474b5dc0 100644 --- a/mail-client/neomutt/Manifest +++ b/mail-client/neomutt/Manifest @@ -1 +1,2 @@ DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e +DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3 diff --git a/mail-client/neomutt/neomutt-20200626-r1.ebuild b/mail-client/neomutt/neomutt-20200626-r1.ebuild index d07e9f9f684..d45bb541971 100644 --- a/mail-client/neomutt/neomutt-20200626-r1.ebuild +++ b/mail-client/neomutt/neomutt-20200626-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit eutils flag-o-matic +inherit eutils if [[ ${PV} =~ 99999999$ ]]; then inherit git-r3 @@ -14,6 +14,9 @@ else KEYWORDS="~amd64 ~x86" fi +TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75 +SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )" + DESCRIPTION="A small but very powerful text-based mail client" HOMEPAGE="https://neomutt.org/" @@ -21,11 +24,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic - ssl tokyocabinet" - -# Disable tests until neomutt-test-files are avablae -# (https://bugs.gentoo.org/734122) -RESTRICT=test + ssl tokyocabinet test" CDEPEND=" app-misc/mime-types @@ -37,38 +36,45 @@ CDEPEND=" ) =net-libs/gnutls-1.0.17 ) - gpgme? ( >=app-crypt/gpgme-0.9.0 ) + gnutls? ( >=net-libs/gnutls-1.0.17:= ) + gpgme? ( >=app-crypt/gpgme-0.9.0:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) - notmuch? ( net-mail/notmuch ) + notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) - !slang? ( sys-libs/ncurses:0 ) + !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6:0 ) - libressl? ( dev-libs/libressl ) + !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) + libressl? ( dev-libs/libressl:= ) ) " DEPEND="${CDEPEND} - dev-lang/tcl + dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets - || ( www-client/lynx www-client/w3m www-client/elinks ) - )" + || ( + www-client/lynx + www-client/w3m + www-client/elinks + ) + ) +" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-mutt ) " +RESTRICT="!test? ( test )" + src_configure() { local myconf=( "$(usex doc --full-doc --disable-doc)" @@ -94,11 +100,22 @@ src_configure() { "--sysconfdir=${EPREFIX}/etc/${PN}" "$(use_enable ssl)" "$(use_enable gnutls)" + + "$(usex test --testing --disable-testing)" ) econf CCACHE=none "${myconf[@]}" } +src_test() { + local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})" + pushd ${test_dir} || die "Could not cd into test_dir" + NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \ + || die "Failed to run the setup.sh script" + popd || die "Could not cd back" + NEOMUTT_TEST_DIR="${test_dir}" emake test +} + src_install() { emake DESTDIR="${D}" install