From nobody Sat Jul 30 17:37:26 2022 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 4LwBRB4X8bz4X3fK; Sat, 30 Jul 2022 17:37:26 +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 4LwBRB40Kcz3KJ3; Sat, 30 Jul 2022 17:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659202646; 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=BOASPQr1Zc9mb2tXuQKNQCclyExB5sliumfHCemyqmw=; b=e0TwAVMttVyF9wruT2DHIMeXR+CrOeiXJoNjOx5Js2jTHQLPGkaxKuEgdNxAC/cWI4A9vk XGxtLYapnlmccu7mozleSftxMUtsHST1brXiXZA4ktCHkXSOmZCDk6gyHPEUHASwb1e1Qn KDIohgTkbO5JUduNmGCyTgrgu0x/SJA/F1j26/wfiI2BcOsFzseZjep9n4uZMY0tP5m1JN KuYzqWBVGHMncukZWVfovlw3NLnCwySZshWf4BXkzBlD+M+T1ha/31OdfcAYqp6f907k99 93HiuxQ3ChZbTHa/rZe7KXnbbyPdbNOeVWu2SQVRr6/TiIvEjHsCVer/61N0HQ== 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 4LwBRB32qyzNRY; Sat, 30 Jul 2022 17:37:26 +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 26UHbQrU085210; Sat, 30 Jul 2022 17:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26UHbQUl085209; Sat, 30 Jul 2022 17:37:26 GMT (envelope-from git) Date: Sat, 30 Jul 2022 17:37:26 GMT Message-Id: <202207301737.26UHbQUl085209@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: b2a29737c545 - main - www/cpp-httplib: Fix 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2a29737c545d8554c4c95e1a5096b6b0b1a3a95 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659202646; 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=BOASPQr1Zc9mb2tXuQKNQCclyExB5sliumfHCemyqmw=; b=tjrUWCX/J22Hi+ZG9s8hB/oqFsHDdRTq9vihqntqbYre1X0MLzjSyKO55fM5fgDlqfTF4r nm+YTjuGjKCbNj+p7A9tNgFR0YG33sla6QtP6TMfmIdXRnFa307WDTQWmVfBJ/yXDrZnhq iLySbXKwPq/h9mBQ7K+yCpVp5g+YIKkOxepc4MTMOyB8DC8uQFhYkHJGmGtFpYCPD/AH58 H2YvLyaQsDf8lNvj8C1738h8KlbwAY952ixE+lBTGlFomX9RvmCfDF/NjzbR02kTgUP4zO /Z3oFaDK7bJQhK/e09KJbu4cq+6237xplVaHFyGfajHIXtMAMkFRIi/bH6lBng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659202646; a=rsa-sha256; cv=none; b=J35nHMOEvrJR6t5TLVeG11cbppsWeWHySnJtiZFFi5Z3GXdpy97HOKis4cl8QnIh19lVun Dz0rD4OKLGVUKjvxzlbKk4yx3AV1didpfrx6k/qIIXTzz8PaxrrH52M00oA3BBEFrSFrgq SUnTYypaOedwDkzThlr1Rtmk+unh6FcZf1AFg/Icaosrqy7/oPn5OoA/HynvEruSim1dQr 0tNVzbRDRrDT2dK/h4le/EnkeSIM40b/MrCch2F64OsnEdZItYG/p/TJunfr9PhZGkOKaH DEsRY2QO7aX4y9C9Z2lMdMdf6IIud9CKYrFaonYZI1pUiuwd3uXdsNMzpJjtSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2a29737c545d8554c4c95e1a5096b6b0b1a3a95 commit b2a29737c545d8554c4c95e1a5096b6b0b1a3a95 Author: Yuri Victorovich AuthorDate: 2022-07-30 17:37:03 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-30 17:37:23 +0000 www/cpp-httplib: Fix tests --- www/cpp-httplib/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/www/cpp-httplib/Makefile b/www/cpp-httplib/Makefile index 9eec780292e4..82a8c4c6e4ba 100644 --- a/www/cpp-httplib/Makefile +++ b/www/cpp-httplib/Makefile @@ -9,8 +9,7 @@ COMMENT= C++ header-only HTTP/HTTPS server and client library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= gmake:devel/gmake \ - googletest>0:devel/googletest +TEST_DEPENDS= gmake:devel/gmake USES= cmake localbase:ldflags python:test # localbase only for tests @@ -29,6 +28,8 @@ PLIST_FILES= include/httplib.h \ lib/cmake/httplib/httplibConfigVersion.cmake \ lib/cmake/httplib/httplibTargets.cmake +CONFLICTS_BUILD= googletest # should be CONFLICTS_TEST + OPTIONS_DEFINE= BROTLI SSL OPTIONS_DEFAULT= BROTLI SSL @@ -39,7 +40,7 @@ BROTLI_RUN_DEPENDS= brotli>0:archivers/brotli SSL_USES= ssl SSL_CMAKE_BOOL= HTTPLIB_REQUIRE_OPENSSL HTTPLIB_USE_OPENSSL_IF_AVAILABLE -do-test: install # some tests fail to compile, see https://github.com/yhirose/cpp-httplib/issues/1338 - @cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" +do-test: # one test fails, see https://github.com/yhirose/cpp-httplib/issues/1339 + @cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} CXXFLAGS="${CXXFLAGS} -I${WRKSRC}/test" LDFLAGS="${LDFLAGS}" .include