git: cbee39bcd1a2 - main - Mk/Uses/cmake.mk: use proper environment in do-test

From: Matthias Andree <mandree_at_FreeBSD.org>
Date: Fri, 03 May 2024 18:45:31 UTC
The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cbee39bcd1a2472b8f3e24754f5bb3a3429b79a0

commit cbee39bcd1a2472b8f3e24754f5bb3a3429b79a0
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2024-04-22 18:51:41 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
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