From nobody Mon Mar 9 07:03:59 2026 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTp000MC6z6VJP6 for ; Mon, 09 Mar 2026 07:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTnzz5SNGz3LjD for ; Mon, 09 Mar 2026 07:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773039839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pfqn8aG5Fi/LC7Eg3kVrwLPQ96vWBliBywe2mxJzrls=; b=RyWjeWY4wLYrOjTrKx5mLDc/SuCcl7Z/1l5fb/AvSo74YmBz5obkckxIOy3ZysGOm/LCsR 7O94A7flW8JPPYCBAFVx6eC5n2BiuMJdgciGeICaF5MNnD0XYiiYa4smv0l1aiCEZGQOgP XTTi2Q3WUi/qcqf5/KD6Kx2qOMLQmWNJQCvBahtl724bmQpFQk1Ab+khI0M6SNojIGIkah Csbo4WhtNpa+mkeud7f5V90f40+9GVxbues8Bz03ed8gp4kaFaQ06hQeG0BYghxv+ag1Tc cE0jG2bzIAoVWP4rSRrTPQ2XK9VUkd1koFMlgwdZwxyBRejmKfFDNMi+NTqaRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773039839; a=rsa-sha256; cv=none; b=fHif/782vsDBuGS2Idl9FQ0BPOe42oL/5hHtsyAjwfc89/m8/xNQV+5q6LeNZ9A5jWzZ1m 6WlhfLQXcMn/8PX4I9FsjcxiT2Or+uhywiI/yRNQ8Qe+QkUtB2ZDouu2VeMgyPpsJDGIYn kaksr1FiNnYxxH7t1ASJjxLNjUdUyq/niks6Q9NLFFuyP2dCCaFJsqzF+7AAgEY2Co0xn4 4QFloI51WYFiW65ABzK6Ea2gYh1DwVa2RLf/mM+hoAjpoXIavsd4j4UkZnrAMGYb1QBume P3jLCF6yPMFkzrAtYjy5aHFWIUZeyK6krZJl8hBjmJ//aFeh9lNWoPgEKciPDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773039839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pfqn8aG5Fi/LC7Eg3kVrwLPQ96vWBliBywe2mxJzrls=; b=pFI8dOE1tv/wOBQHO2IHzRm29mvtWR8nVv0n6T+vO2z88ALckvOJomP4QYIPKWYwRoew67 fRhaQOS0jv4EYVcmaSc4wUReARlKjV7jAVrgqt6Jaz1HymzzT1dkzVajPJ3u26osvSSNtw mcedpkQhycEIn1HmrobBl+KO/Ejbf4WuME4DEwfV781rOsUYOHvn7ipzwP62Lv8SAvJlfY cV6uX94zdzZaNz34TaTAgGorgbJaLwx47d1hJsJ9pL0k/tp0Ihd5lAXkeXPSkD7ke63lTa nMVZ8RZFmwescqLgNa6lPCxdzHSALMxNGoGlrJeovsqmog3q6T+LATstZ5eK3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTnzz4jP3znW for ; Mon, 09 Mar 2026 07:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25ebc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 07:03:59 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 4fcfa3f6b13d - main - devel/hs-cabal-install: Enable testing List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fcfa3f6b13d9cbf379f63da74ca8b3e730747ae Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 07:03:59 +0000 Message-Id: <69ae70df.25ebc.116d2e88@gitrepo.freebsd.org> The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4fcfa3f6b13d9cbf379f63da74ca8b3e730747ae commit 4fcfa3f6b13d9cbf379f63da74ca8b3e730747ae Author: Gleb Popov AuthorDate: 2026-03-07 06:45:10 +0000 Commit: Gleb Popov CommitDate: 2026-03-09 07:03:51 +0000 devel/hs-cabal-install: Enable testing --- Mk/Uses/cabal.mk | 2 +- devel/hs-cabal-install/Makefile | 13 +++++++++++++ .../files/patch-cabal-benchmarks_bench_CabalBenchmarks.hs | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index d700961174b1..34024cc07d02 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -88,7 +88,7 @@ CABAL_EXECUTABLES?= ${PORTNAME} CABAL_CMD?= cabal CABAL_PORT= devel/hs-cabal-install -CABAL_HOME= ${WRKDIR}/cabal-home +CABAL_HOME?= ${WRKDIR}/cabal-home CABAL_HOME_ENV=XDG_DATA_HOME=${CABAL_HOME} XDG_CONFIG_HOME=${CABAL_HOME} XDG_CACHE_HOME=${CABAL_HOME} HOME=${CABAL_HOME} CABAL_LIBEXEC= libexec/cabal CABAL_EXTRACT_SUFX= .tar.gz diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile index b8bea63466a1..d1b565490e41 100644 --- a/devel/hs-cabal-install/Makefile +++ b/devel/hs-cabal-install/Makefile @@ -10,6 +10,8 @@ WWW= https://www.haskell.org/cabal/ LICENSE= BSD3CLAUSE +TEST_DEPENDS= git:devel/git + USES= cabal:nodefault compiler:c11 pkgconfig python:build USE_GITHUB= yes @@ -53,6 +55,11 @@ USE_CABAL= alex-3.5.3.0 \ CABAL_EXECUTABLES= cabal SKIP_CABAL_EXTRACT= yes +TESTING_UNSAFE= Tests require network access +.if make(test) +CABAL_HOME= ${WRKDIR}/cabal-test-home +.endif + post-extract: ${MKDIR} ${WRKSRC}/_build/tarballs/ .for package in ${USE_CABAL} @@ -73,4 +80,10 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/_build/bin/cabal ${STAGEDIR}${PREFIX}/bin/ +do-test: + cd ${WRKSRC} && \ + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update + cd ${WRKSRC} && \ + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} test all + .include diff --git a/devel/hs-cabal-install/files/patch-cabal-benchmarks_bench_CabalBenchmarks.hs b/devel/hs-cabal-install/files/patch-cabal-benchmarks_bench_CabalBenchmarks.hs new file mode 100644 index 000000000000..6b13f151194f --- /dev/null +++ b/devel/hs-cabal-install/files/patch-cabal-benchmarks_bench_CabalBenchmarks.hs @@ -0,0 +1,14 @@ +--- cabal-benchmarks/bench/CabalBenchmarks.hs.orig 2025-12-05 21:21:24 UTC ++++ cabal-benchmarks/bench/CabalBenchmarks.hs +@@ -17,9 +17,9 @@ main = defaultMain + main :: IO () + main = defaultMain + [ bgroup "parseGPD" +- [ env (BS.readFile "Cabal/Cabal.cabal") $ \bs -> ++ [ env (BS.readFile "../Cabal/Cabal.cabal") $ \bs -> + bench "Cabal" $ whnf parseGenericPackageDescriptionMaybe bs +- , env (BS.readFile "cabal-benchmarks/cabal-benchmarks.cabal") $ \bs -> ++ , env (BS.readFile "../cabal-benchmarks/cabal-benchmarks.cabal") $ \bs -> + bench "cabal-benchmarks" $ whnf parseGenericPackageDescriptionMaybe bs + ] +