diff options
| author | Daniel Engberg <diizzy@FreeBSD.org> | 2024-06-05 21:44:44 +0000 |
|---|---|---|
| committer | Daniel Engberg <diizzy@FreeBSD.org> | 2024-06-06 19:05:47 +0000 |
| commit | 3522562bd1443ced62a674a22fec1877277b1b3b (patch) | |
| tree | 0ddae3bf16d20f5425d5d155be4a377b2468d82b | |
| parent | 4a384fbfb20b4d684f86aa3af1f898abf809ed49 (diff) | |
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)
| -rw-r--r-- | Mk/Uses/cmake.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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 |