From nobody Wed Jul 05 05:30:13 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 4QwpCB0vB3z4l3v3; Wed, 5 Jul 2023 05:30:14 +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 4QwpCB0Mk8z4RYl; Wed, 5 Jul 2023 05:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688535014; 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=QK7+E2AHD5fg/USA4Q9MRF3egITdq2JItDMDWWWf45k=; b=Kup/BOJn0sCGZkcB6RnuE8o4d0nrTp4syKGbeAQDL+x++k0x8EJYE2LbvpZSyxYvzxA5VB QnrZkBWT7z68TfSaHjbz5UWDCxI8tlYTEbQIwN+SLb3/Snybw4hFrzI9cSKj3EpoAZRiao /XC+2Ryk1QCtPWknJwTwTelmyhL9hyCOfAwDsZh8hI89OtXWsbz9exx6AOoqrA0VrZjmEZ DlUWgFpS4rRu4+JgmJpeAWvRA+gXIJmayIwvWgRHWLLbN7qAKWyh7NGooKaNkraj9nr50h fUTxDmEuctJH1XziCOcPb+8PrlV8/X0y+s5s4FkeVYSJblwlUr+0yw9kIZPK6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688535014; 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=QK7+E2AHD5fg/USA4Q9MRF3egITdq2JItDMDWWWf45k=; b=Sm5WHVmlxRKOPDDhf0xCBjN8igMgdFrNk77d9Rn3w+xZb8UxUhUI857HMwF5tbQ6bbtcqL ZOVcS6zIj6vq/v7wcCapVFY0ukSXgYqUUUReDxG2HwefaFeXHzShTASGZchvGamUrRZXJn TyjADbEX5buDmAEK3nsjizpLjcBBMv+FVTKw50/ycMBvBaOJ3TUzZGDjRYLGsTAXsjINsH i+tDoDxvAZdiOIjhtBodovnwl3M8eYKrYegj8JbP6x6vE3DUQUUY3Fi3R++ktQxe9a0U0L MP192h/No9B9dhpsz/Ea6N6R/JlLJSDI6t7YEgDytTD5osoE21b1StMiQjGd1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688535014; a=rsa-sha256; cv=none; b=KiAhIgG0EfLgzdveX2hNnfViRovCRlKJsvEXZrv7Sv9GIZjUzKLdK9chOYQgE1rU8ZRojz 6+3aaboDQ/eqvgbqmdc8HQYFLWD59c+ZTH2bVLLmb832SyZtuaHh4HxBL32JlPUt8rVKmI ozynJQvU/GbVa0grOpj1PIGfyfoQZPxkcSyRKBX+HNhozzHQrrmir8403NNsl2pjfW85wq sneb9p47AffMy1qsVM49cAKRU/icMqbFmo8Nc6+nRt8oqs2cM50ilN1xeichrArIyviYz3 i1gMw+DXDF9k5We4avlLSutP9+voAa5iVrps810Qgv5Nbr0EMkx1GZ0yqcMSDA== 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 4QwpC96QQ9z12nH; Wed, 5 Jul 2023 05:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3655UDF1016826; Wed, 5 Jul 2023 05:30:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3655UDat016820; Wed, 5 Jul 2023 05:30:13 GMT (envelope-from git) Date: Wed, 5 Jul 2023 05:30:13 GMT Message-Id: <202307050530.3655UDat016820@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: 2c9dc366f214 - main - devel/cpp-utilities: Add patch; Attempt to 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: 2c9dc366f214cdbb623d3b954ce3f701f87e9989 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c9dc366f214cdbb623d3b954ce3f701f87e9989 commit 2c9dc366f214cdbb623d3b954ce3f701f87e9989 Author: Yuri Victorovich AuthorDate: 2023-07-05 03:44:42 +0000 Commit: Yuri Victorovich CommitDate: 2023-07-05 05:30:09 +0000 devel/cpp-utilities: Add patch; Attempt to fix tests --- devel/cpp-utilities/Makefile | 5 +++-- devel/cpp-utilities/files/patch-tests_testutils.cpp | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/devel/cpp-utilities/Makefile b/devel/cpp-utilities/Makefile index d4cfea6e818c..d631c136efa4 100644 --- a/devel/cpp-utilities/Makefile +++ b/devel/cpp-utilities/Makefile @@ -1,6 +1,7 @@ PORTNAME= cpp-utilities DISTVERSIONPREFIX= v DISTVERSION= 5.24.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -11,6 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs +TEST_DEPENDS= cppunit>0:devel/cppunit USES= cmake:testing compiler:c++17-lang USE_LDCONFIG= yes @@ -19,7 +21,6 @@ USE_GITHUB= yes GH_ACCOUNT= Martchus CMAKE_ON= BUILD_SHARED_LIBS - -# unclear how to run tests, see https://github.com/Martchus/cpp-utilities/issues/26 +CMAKE_TESTING_ARGS= -DEXCLUDE_TESTS_FROM_ALL=OFF # tests fail to link: ld: error: unable to find library -lcppunit, see https://github.com/Martchus/cpp-utilities/issues/27 .include diff --git a/devel/cpp-utilities/files/patch-tests_testutils.cpp b/devel/cpp-utilities/files/patch-tests_testutils.cpp new file mode 100644 index 000000000000..f98330cb99ec --- /dev/null +++ b/devel/cpp-utilities/files/patch-tests_testutils.cpp @@ -0,0 +1,11 @@ +--- tests/testutils.cpp.orig 2023-07-05 03:40:48 UTC ++++ tests/testutils.cpp +@@ -621,7 +621,7 @@ std::vector TestApplication::readTestfile + auto binaryPath = std::string(); + #if defined(CPP_UTILITIES_USE_STANDARD_FILESYSTEM) && defined(PLATFORM_UNIX) + try { +- binaryPath = std::filesystem::read_symlink("/proc/self/exe").parent_path(); ++ binaryPath = std::filesystem::read_symlink("/proc/curproc/file").parent_path(); + binaryPath += '/'; + } catch (const std::filesystem::filesystem_error &e) { + cerr << Phrases::Warning << "Unable to detect binary path for finding \"srcdirref\": " << e.what() << Phrases::EndFlush;