From nobody Thu Jun 06 19:07:54 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 4VwDP72cHKz5LQ2M; Thu, 06 Jun 2024 19:07:55 +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 4VwDP659bhz4bRZ; Thu, 6 Jun 2024 19:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717700874; 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=3bz2tfuT8drq1XKn6k2W0KqMMBJezNHTPTZxpV9lLT4=; b=nsCdMytVJB0s829Kaa0gNy7yjW6054MCkoqqjac8SOReVgng7LC88E/QMIfGASg5xEgxSh ssPw/YdspCdw+ijzaD6EizrjV6by0p1n0jfosXn/EgTcJNHzXuX9kEnDWm0Y2OXF4/+9SD 8OjAnQbxWZI2ou/liClDNjPjcDUeGqWKd4SVFP+kCnWSHa684ftWCVp3X3+BUwPyBEYFIB GlwjUWo5dIdAZ6D49SMmXxOka5bDcSNGZ5lRvknU305tNAAaJ9LDSHcXsCdwn80k00bjDo bedqO3Di985Zr1d0JDN2aYtA9l/BghOBixjwUdCync7xiV3ds+VmXgWvbpbxNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717700874; a=rsa-sha256; cv=none; b=vRQhLcn7HcHbHQlSyQ5dfHsPlpWbox5dlMEkZKpS7KAqJAf6PdjKP3pa8FHioNow1K5xYW 3st6755c1wpbXSpnJTT1//sNd3vs7Ax6l79wJ3Q0cqyy1EuMRJ+cUcbeJgn8DDiDhSbPuU +ZG1T4mMTb9jca872B/ZoI0SfWZ+AhtcaAA2Dh2cBnFrX9Bg5KZoOlBzDIOEuwpDw4pX/Y TxbSn2XyiEI3hB4viWfpxi09P5owigZJ+6EEcYXvlzkCaim0j0dwkDpNIBCJceRPiXfxF0 Loa47vw0UzlxE5XTXEcGwtP+5t0mMvxRxU/zhoduTE/nVSZ+XdLKU8rX61k3Zw== 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=1717700874; 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=3bz2tfuT8drq1XKn6k2W0KqMMBJezNHTPTZxpV9lLT4=; b=knX1xhxTNkGfmRE/NRS/qna3nYvpwcGlwDFFjm6EvKy3jTHbFCwawDCXVnU5svpEC/N9dN P9kqMj3/lUfigbKAWpjU+wIfdjvfhXw2dIjAL29GF2DUDH+sOb9r5jlPbWlrI8OmZrpPY9 iW4T1ZPLL/KmOqY9Dtye9xOxkAC99CW/MyvyKYOH5M0yXopkxRmfVv3Z7RNvxUPe6+LL5S 4WIb4RD0B8xOsYJNO9LhFcqhj61SKPFpxaELev5OyHhr+cltSpOA1rt2EONKkWNMUZySdH NBtVERMthmEugKao9Ad3BSlVoYuJn3gIm4n+H0iryL2fNzL8HXvStaTBBqc4Wg== 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 4VwDP64crlzyFC; Thu, 6 Jun 2024 19:07:54 +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 456J7sAn077207; Thu, 6 Jun 2024 19:07:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 456J7sFd077204; Thu, 6 Jun 2024 19:07:54 GMT (envelope-from git) Date: Thu, 6 Jun 2024 19:07:54 GMT Message-Id: <202406061907.456J7sFd077204@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 3522562bd144 - main - Mk/Uses/cmake.mk: Make parallel level adjustable for 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: 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3522562bd1443ced62a674a22fec1877277b1b3b Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3522562bd1443ced62a674a22fec1877277b1b3b commit 3522562bd1443ced62a674a22fec1877277b1b3b Author: Daniel Engberg AuthorDate: 2024-06-05 21:44:44 +0000 Commit: Daniel Engberg CommitDate: 2024-06-06 19:05:47 +0000 Mk/Uses/cmake.mk: Make parallel level adjustable for tests Some projects don't support running tests in parallel (for example chinese/libchewing) and currently there's no way of disabling it. Add CMAKE_TESTING_PARALLEL_LEVEL and default to MAKE_JOBS_NUMBER Switch to MAKE_JOBS_NUMBER as _MAKE_JOBS_NUMBER is unset if MAKE_JOBS_UNSAFE is defined. PR: 279316 Approved by: portmgr (arrowd) --- Mk/Uses/cmake.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index 39a9a902ef4a..6e46c2c0051f 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -179,6 +179,7 @@ do-configure: . if !target(do-test) && ${cmake_ARGS:Mtesting} CMAKE_TESTING_ON?= BUILD_TESTING +CMAKE_TESTING_PARALLEL_LEVEL?= ${MAKE_JOBS_NUMBER} CMAKE_TESTING_TARGET?= test # Handle the option-like CMAKE_TESTING_ON and CMAKE_TESTING_OFF lists. @@ -192,7 +193,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} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${_MAKE_JOBS_NUMBER} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} + ${SETENVI} ${WRK_ENV} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${CMAKE_TESTING_PARALLEL_LEVEL} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} . endif . endif