Date: Mon, 20 Mar 2023 15:17:00 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4eb651d91125 - main - print/harfbuzz: simplify tests Message-ID: <202303201517.32KFH0fH039115@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4eb651d911259975b75d7e70cf56c08736d6ee29 commit 4eb651d911259975b75d7e70cf56c08736d6ee29 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-03-20 13:59:45 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303201517.32KFH0fH039115>