From nobody Fri May 3 18:45:31 2024 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 4VWKW00XJ7z5JHGq; Fri, 3 May 2024 18:45:32 +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 4VWKVz70H4z4HmR; Fri, 3 May 2024 18:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714761932; 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=6RGYwHb1couzV4uzdxQlTC+JNhu1vonGBVzDfZHzLsU=; b=SEU4/qsgSBPv4M3rJBtBnoW0zqtoPOHVaI4ZHf7O1praYfX5qg00YrkzFVel2MnHnppU5K I8BzsbCT5wjtbpVX8W19cNdGNDwN3xCcY1+YOK3Vp7rfwXgdkCohY6LXS2KwRIyOpqiM5H 9K/uF6Ux7byGHNoRmVwChLAv2vjrZ6L2jyaoTsPDTfZH0VZcdJXONwnLKODIkflkat0zxX prr5EDO46YuFVS+207My2TRb4fMVVyMmejZgwTSyVY3D9D7zS3vRCjdHfewNqZ2LkkB2hd Fi34lfNURFsrEhwPJlXDn0eNfFz0Tf0yRq5jD2YEVJGjaZiVzTXzHVdt7gbI1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714761932; a=rsa-sha256; cv=none; b=dOX66yMbPhYh+3BT9qWMfh3Dhyro7JsDSlPxYeeNDTd4lDkgYZRL7DBOohgjGYj6D4oRmv C3ug+UQPRk/StG31r0Ee9t83dkRK93onU0fHcauxN7aChYgi4wbwq9WrIZZZxiiY1RziuP G27ernrEPTh9z6WNe17Wd5p/W6Z9xrTi5osQqXoFE/vuTIf15mhEwTJgTdGkp4OVYVoXvR sqgZr++zesHiQyolRMDuOU52NkcYFwOfw9pqZtACStQuzby8z4GQym5q4+BfpfaII5s7FO h+58GTfRr3o3tGwnLueMYdC3kDrj3RaBgXlbD56jgkNUvY+c+Zk4Hntsz4VR5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714761932; 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=6RGYwHb1couzV4uzdxQlTC+JNhu1vonGBVzDfZHzLsU=; b=nuRjAluYVWkjq6XnrwHeo7gL7QOrjTFAV5AA9Wd9TZ9V89NCmxkTe/vSTKEFxhwUlCtHse VWyW4ln6rchbnt7ECKMwyJiWb1/ZiglQpAag3lTzH+C39X1rUmf+DLfPjS9lnkirU4efUi 88rcn8BUomUuWOdFjJ0+hgts5RAtOk435lZHrJe68CVScFTF8X52agKetnf3i4eywjlcIO b5by4dNFs1un/YaVdGZVn1fu8hDyKwKCl/FBGJdzWa3VIPuhEpxnn1OrjOSvfw4/1zAsGu FDkg9RvtMN3QgyXtnpP/kZITV92RVc+nwdAIrB1BsgGIxKec3SzxsyGTt9grjw== 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 4VWKVz6T3fzxkt; Fri, 3 May 2024 18:45:31 +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 443IjVCU059704; Fri, 3 May 2024 18:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 443IjVsa059701; Fri, 3 May 2024 18:45:31 GMT (envelope-from git) Date: Fri, 3 May 2024 18:45:31 GMT Message-Id: <202405031845.443IjVsa059701@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: cbee39bcd1a2 - main - Mk/Uses/cmake.mk: use proper environment in do-test 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbee39bcd1a2472b8f3e24754f5bb3a3429b79a0 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbee39bcd1a2472b8f3e24754f5bb3a3429b79a0 commit cbee39bcd1a2472b8f3e24754f5bb3a3429b79a0 Author: Matthias Andree AuthorDate: 2024-04-22 18:51:41 +0000 Commit: Matthias Andree CommitDate: 2024-05-03 18:44:39 +0000 Mk/Uses/cmake.mk: use proper environment in do-test * the actual test run used MAKE_ENV but should use TEST_ENV * also, ctest(1) defaults to running tests serially, so add CTEST_PARALLEL_LEVEL here and set it to _MAKE_JOBS_NUMBER. NOTE: cmake 3.29 changes semantics for _MAKE_JOBS_NUMBER empty or 0. This was developed together with diizzy@ as a result of analysing performance regressions from PR 278500. PR: 278533 Approved by: portmgr@ (tcberner@) --- Mk/Uses/cmake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index 4129f0f341fc..18293c4fdfa5 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -192,7 +192,7 @@ do-test: @cd ${BUILD_WRKSRC} && \ ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \ - ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} + ${SETENVI} ${WRK_ENV} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${_MAKE_JOBS_NUMBER} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} . endif . endif