Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 May 2021 00:55:09 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8bccdd758b81 - main - textproc/nuspell: convert TEST option to USES=cmake:testing
Message-ID:  <202105180055.14I0t9XZ047316@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=8bccdd758b81def6f98a3a142e561ccc51892398

commit 8bccdd758b81def6f98a3a142e561ccc51892398
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-05-17 13:21:39 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-05-18 00:47:16 +0000

    textproc/nuspell: convert TEST option to USES=cmake:testing
---
 textproc/nuspell/Makefile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/textproc/nuspell/Makefile b/textproc/nuspell/Makefile
index 4c86da99670d..054823968d64 100644
--- a/textproc/nuspell/Makefile
+++ b/textproc/nuspell/Makefile
@@ -11,22 +11,20 @@ LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 LIB_DEPENDS=	libicuuc.so:devel/icu
+TEST_DEPENDS=	catch>0:devel/catch \
+		bash:shells/bash
 
-USES=		cmake compiler:c++17-lang
+USES=		cmake:testing compiler:c++17-lang
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
+CMAKE_OFF+=	${CMAKE_TESTING_ON}
 
-OPTIONS_DEFINE=	MANPAGES TEST
+OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
 
-TEST_BUILD_DEPENDS=	catch>0:devel/catch \
-			bash:shells/bash
-TEST_CMAKE_BOOL=	BUILD_TESTING
-TEST_TEST_TARGET=	test
-
 post-patch:
 # Skip README as it only contains install instructions
 	@${REINPLACE_CMD} -i .doc '/README/d' ${WRKSRC}/CMakeLists.txt
@@ -34,8 +32,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \
 		${WRKSRC}/src/nuspell/finder.cxx
 
-pre-install-TEST-on:	do-test
-
 makepatch-clean:
 	@${RM} ${WRKSRC}/tests/suggestiontest/Makefile.orig
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105180055.14I0t9XZ047316>