From nobody Mon Mar 20 15:17:00 2023 X-Original-To: dev-commits-ports-main@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 4PgJHc3DP7z3yrNS; Mon, 20 Mar 2023 15:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PgJHc2YSHz3rJ8; Mon, 20 Mar 2023 15:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679325420; 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=aX0/dAZG1ulMbhOiadFVJQVu/F6CgCwC2idy2CVl/0k=; b=cbXAQvWItrB2zf9ClxXltAsTj0yDYtABu8CqDK00B/cTwBdVX5MVia3zuP5RdSeUBJLzq5 94arXKBi5MRvJiDvGK6tzTwAYrbayhAkEUsY+v2pwBTvEHsUsjZN9IHuT1VJ3snxcMgjXi i4vdz3VsEPOape+pG9gfIwDUCR3K8EU/J1t1sbcr5FaoLMOAvHLeKI0wi4Va1ft7E8VaBF p8mwbLpB7lozdjz11/dPIJCgyupVUBY0hARiGASoBjxm7jIEbLR39J4ZYf8AJ8O/0WTDux Sa4QdZspDOLtdySjT7x2mCzzKMpwoWzh/f2q17sBjxV0kyMj18v33b2hQMpvig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679325420; 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=aX0/dAZG1ulMbhOiadFVJQVu/F6CgCwC2idy2CVl/0k=; b=vGClo6vbBZCpRXVqS2tKfeQEvIdoaI+8+OEaAPho9aBBYajeYp0bH6SI190/vJgMofkRWL QRaw9L3GVIl1k8J+m2IeUkTNb2+vvyo176Jrfb3qJRTCjBdQ0+4R7yqOB5KQg5SOhkVcdq 3TNX9QUlC7R8po5E90yrl74Fn0FYaV1eFxeRHsqHn8AqW4zSsYgjmWi5Ky7yPRHxDDGv1J DhmOYCb1cba4rXyuZigBUXYRQXaKwLSM6wYIcvnYXf0SNGYn4I0FvRQj6MgIyDUeogo04T PLmRPGwRQeDD/kSuKVTLRx6Lq3d7AjBKDAcD7PeeSeSZAlMJMCdva+3xnN31Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679325420; a=rsa-sha256; cv=none; b=qcUIsOVb7Xt43kdyeBp/AQQiWHaYXvNLRgFasu4lQDiROXSdrKvih+khY6qnOBGOi8R5Yz 885hnaFJTA1RdZSN2DcPojrJV2WCZOgje3pwy4puW3BZzt+hs6xIjSnkjJist9HKyWzwRy bDACX5pTsW5LFccGp0yn2iRuLT0hr8b3KE7DlVbcNYSRX+D754oAisLjWI4k91jO1cXsBu +ptASuHPVuViE9XJ5En/+0hp9QpirfLLLO++h/215fGohPXYamZm/c0cbRhP0NxXVRb+bv fCjPzGXs1G0NuRuPyq/2auWLyKTBQesizyYlRkuvZBJiE+HQh+CA5805ZzVinQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgJHc1ZLnzZZV; Mon, 20 Mar 2023 15:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KFH0r5039116; Mon, 20 Mar 2023 15:17:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KFH0fH039115; Mon, 20 Mar 2023 15:17:00 GMT (envelope-from git) Date: Mon, 20 Mar 2023 15:17:00 GMT Message-Id: <202303201517.32KFH0fH039115@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 4eb651d91125 - main - print/harfbuzz: simplify tests List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4eb651d911259975b75d7e70cf56c08736d6ee29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4eb651d911259975b75d7e70cf56c08736d6ee29 commit 4eb651d911259975b75d7e70cf56c08736d6ee29 Author: Jan Beich AuthorDate: 2023-03-20 13:59:45 +0000 Commit: Jan Beich CommitDate: 2023-03-20 15:16:33 +0000 print/harfbuzz: simplify tests Drop TEST option in favor of re-invoking build via "make test". --- print/harfbuzz/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile index 44775a653f77..ec46ed76f8e1 100644 --- a/print/harfbuzz/Makefile +++ b/print/harfbuzz/Makefile @@ -22,34 +22,38 @@ SHEBANG_GLOB= *.py CPE_VENDOR= harfbuzz_project MESON_ARGS= -Dglib=enabled -Dgobject=enabled -Dgraphite2=enabled \ - -Dchafa=disabled -Dfreetype=enabled + -Dchafa=disabled -Dfreetype=enabled -Dtests=disabled PLIST_SUB+= LIBVER=0.60710.0 HARFBUZZ_SLAVE?= no .if ${HARFBUZZ_SLAVE} == no -OPTIONS_DEFINE= DOCS TEST +OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc DOCS_MESON_ENABLED= docs -TEST_MESON_ENABLED= tests .endif .if ${HARFBUZZ_SLAVE} == no MESON_ARGS+= -Dicu=disabled -Dcairo=disabled .elif ${HARFBUZZ_SLAVE} == icu -MESON_ARGS+= -Dicu=enabled -Dcairo=disabled -Ddocs=disabled \ - -Dtests=disabled +MESON_ARGS+= -Dicu=enabled -Dcairo=disabled -Ddocs=disabled LIB_DEPENDS+= libharfbuzz.so:print/harfbuzz \ libicudata.so:devel/icu .elif ${HARFBUZZ_SLAVE} == cairo -MESON_ARGS+= -Dcairo=enabled -Dicu=disabled -Ddocs=disabled \ - -Dtests=disabled +MESON_ARGS+= -Dcairo=enabled -Dicu=disabled -Ddocs=disabled LIB_DEPENDS+= libharfbuzz.so:print/harfbuzz USE_GNOME+= cairo .endif +pre-test: + @if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \ + ${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \ + ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \ + ${TOUCH} ${WRKDIR}/.meson_build_tests; \ + fi + .include