Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Aug 2023 15:57:31 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 96c827a89186 - main - devel/rapidjson: unbreak tests
Message-ID:  <202308041557.374FvVDO076101@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=96c827a89186661d75b54acd1f11c9d962a96a1f

commit 96c827a89186661d75b54acd1f11c9d962a96a1f
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-08-04 15:56:48 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-08-04 15:57:29 +0000

    devel/rapidjson: unbreak tests
    
    PR:             272936
---
 devel/rapidjson/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/devel/rapidjson/Makefile b/devel/rapidjson/Makefile
index d79ac169a871..2fcda9455e99 100644
--- a/devel/rapidjson/Makefile
+++ b/devel/rapidjson/Makefile
@@ -14,7 +14,9 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 TEST_DEPENDS=	googletest>0:devel/googletest \
-		valgrind:devel/valgrind
+		${TEST_DEPENDS_${ARCH}}
+TEST_DEPENDS_amd64=	valgrind:devel/valgrind
+TEST_DEPENDS_i386=	valgrind:devel/valgrind
 
 USES=		cmake:testing compiler:c++11-lang cpe pathfix
 CPE_VENDOR=	tencent
@@ -24,9 +26,10 @@ GH_ACCOUNT=	Tencent
 
 NO_ARCH=	yes
 
-CMAKE_ARGS=	-DGTEST_INCLUDE_DIR=${LOCALBASE}/include -DGTESTSRC_FOUND=TRUE
-CMAKE_OFF=	RAPIDJSON_BUILD_TESTS RAPIDJSON_BUILD_EXAMPLES
+CMAKE_ARGS=	-DGTEST_SOURCE_DIR=${NONEXISTENT} -DGTEST_INCLUDE_DIR=${LOCALBASE}/include -DGTESTSRC_FOUND=TRUE
+CMAKE_OFF=	RAPIDJSON_BUILD_CXX11 RAPIDJSON_BUILD_TESTS RAPIDJSON_BUILD_EXAMPLES
 CMAKE_TESTING_ON=	RAPIDJSON_BUILD_TESTS
+CMAKE_TESTING_ARGS=	${"${TEST_DEPENDS:Mvalgrind*}":?:-DCMAKE_CTEST_ARGUMENTS\:STRING="-E;valgrind"}
 
 OPTIONS_DEFINE=	DOXYGEN
 OPTIONS_DEFAULT=${OPTIONS_DEFINE}



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