From nobody Tue Aug 09 19:35:13 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 4M2NZV06FYz3j3DW; Tue, 9 Aug 2022 19:35: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 4M2NZT6r0Wz3bZD; Tue, 9 Aug 2022 19:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660073714; 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=MqbirxbbKCtnwhOv+mLaARafIpu3n4NsBQlTMtadKKA=; b=MljN5M2MFtVB0sQ35BNfdEN0Hlq+LhsLBRC5jdoA52r++wizG5fe4pU0V2U6ROefG/RAQO 0Sjnf/Oj0DAYS+R/0XOB0OJptOJo8HR6Mqg1Iq79JnlgAf3b44zQlqWxFEkKCXVEXa1EJz 4U+Uw/AewnznFRQS1B5jkjLZOYjBONT2dCZZfpwUKCWDalHjcn65za6O7uWx6fExiKDky1 7SgQPnMMqQFx59BTdSrwv2Olx9oGcEQens+PuX4WMgaxAI/avVrv9up8Pc0wIfwf9v5V+Y c9UavvqmNLx3D2FllcqcQG4FHwcSqm3jw4FlzYSOP67FJGea03sd/NV8G70qrg== 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 4M2NZT5yG0zk2w; Tue, 9 Aug 2022 19:35:13 +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 279JZDdp094215; Tue, 9 Aug 2022 19:35:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279JZDhB094214; Tue, 9 Aug 2022 19:35:13 GMT (envelope-from git) Date: Tue, 9 Aug 2022 19:35:13 GMT Message-Id: <202208091935.279JZDhB094214@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: 6db06f48f7f1 - main - devel/benchmark: 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: 6db06f48f7f17c858b4022ca6a7b733faf59dce7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660073714; 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=MqbirxbbKCtnwhOv+mLaARafIpu3n4NsBQlTMtadKKA=; b=ZiedVM2Lwg7Y2OmWEQx8zsdqrhX5EN/S7OoRMzt5Pp8zrosYF1QPGv+0NfF8pePIELQ9/a ulUPY7uiGCWpaR/+jBk4bdF/QarqPPiEVjoNaD9Ud74wUSIJNCT5Zn79A6xIvsAcSRK7Yp 6v2sD8vpBZ8TBMJDVRPwK/aFUQ29gh934L4zKqnPidheehGUiuOzS5nC4yGVXwAeGd9BxB M0LPd26HCsmE1XKfDn36tB4X5pRbcx06heo9vRaAIubiJTKDSXsi/r9FsqOdV0mZ5SDWz7 L1f8juVc8l/Id0dWp54SU7dRWsHOe4s2v//umi4PisAz8YWL/HFG9rFXCBm2ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660073714; a=rsa-sha256; cv=none; b=FPyzQ8V91NOT2EsZzq8yACi++PN6f07bpHWdGGFvRs22+Sq3MopdXzLcZVJ6GyHVIN1z51 LDh7kwPZFUzQO2zrf4DnRLGiybZDfb2fxUQHJFtC/d1U9gwKoMQC7HA3zQc+CAK+/Mqpg7 68cfw0Zx4cNMpD1V5kwHXf74p1A3F1EwZ37EOOemFTjpuq8ZYmmOczPp3eenAqK7SnnoOu 77CzxxF5YhyVB+htGGj6c5HPr7wa2D772eOwr4KINa+Xu6iS4PGzcPazSvRSXCq/c3HPoK Bgy5zYK43MxodkJPO71utDsxMYKDUjL8TXfWAO6AwLTto+R/OnAfY/HrhGp2Vg== 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=6db06f48f7f17c858b4022ca6a7b733faf59dce7 commit 6db06f48f7f17c858b4022ca6a7b733faf59dce7 Author: Yuri Victorovich AuthorDate: 2022-08-09 19:34:37 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-09 19:35:08 +0000 devel/benchmark: Fix tests --- devel/benchmark/Makefile | 11 ++++------- devel/benchmark/distinfo | 4 +++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/devel/benchmark/Makefile b/devel/benchmark/Makefile index bd8de2993ce6..7271de8800b5 100644 --- a/devel/benchmark/Makefile +++ b/devel/benchmark/Makefile @@ -9,24 +9,21 @@ COMMENT= Microbenchmark support library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake compiler:c++11-lang +USES= cmake:testing compiler:c++11-lang USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= google +GH_TUPLE= google:googletest:release-1.12.1:googletest # requires googletest sources for some reason, see https://github.com/google/benchmark/issues/979 CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BENCHMARK_ENABLE_TESTING +CMAKE_TESTING_ON= BENCHMARK_ENABLE_TESTING # BENCHMARK_DOWNLOAD_DEPENDENCIES +CMAKE_TESTING_ARGS= -DGOOGLETEST_PATH=${WRKSRC_googletest} CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_gcc= -Wno-stringop-truncation BINARY_ALIAS= git=false -do-test: # Broken: https://github.com/google/benchmark/issues/979 - @cd ${BUILD_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBENCHMARK_ENABLE_TESTING=ON -DGOOGLETEST_PATH=${LOCALBASE} ${CMAKE_SOURCE_PATH} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test - .include diff --git a/devel/benchmark/distinfo b/devel/benchmark/distinfo index 1036a5eaf053..bcf7401238d8 100644 --- a/devel/benchmark/distinfo +++ b/devel/benchmark/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1659545523 +TIMESTAMP = 1660073282 SHA256 (google-benchmark-v1.7.0_GH0.tar.gz) = 3aff99169fa8bdee356eaa1f691e835a6e57b1efeadb8a0f9f228531158246ac SIZE (google-benchmark-v1.7.0_GH0.tar.gz) = 194165 +SHA256 (google-googletest-release-1.12.1_GH0.tar.gz) = 81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2 +SIZE (google-googletest-release-1.12.1_GH0.tar.gz) = 854944