diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2024-04-22 18:51:41 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2024-05-03 18:44:39 +0000 |
| commit | cbee39bcd1a2472b8f3e24754f5bb3a3429b79a0 (patch) | |
| tree | a9241dcd9d84b8d83d7f74b52e140a2bbf628655 | |
| parent | 7c9c1acf45e7acba7968a0646cfceeaa42ea57bd (diff) | |
| download | ports-cbee39bcd1a2472b8f3e24754f5bb3a3429b79a0.tar.gz ports-cbee39bcd1a2472b8f3e24754f5bb3a3429b79a0.zip | |
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@)
| -rw-r--r-- | Mk/Uses/cmake.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 |