diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index 120cdf23ba10..8ad9460963db 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -185,9 +185,9 @@ do-configure: . endif . if !target(do-test) && ${cmake_ARGS:Mtesting} -CMAKE_TESTING_ON?= BUILD_TESTING -CMAKE_TESTING_PARALLEL_LEVEL?= ${MAKE_JOBS_NUMBER} -CMAKE_TESTING_TARGET?= test +CMAKE_TESTING_ON?= BUILD_TESTING +CMAKE_TESTING_JOBS?= ${MAKE_JOBS_NUMBER} +CMAKE_TESTING_TARGET?= test # Use SETENV instead of SETENVI if CMAKE_TESTING_SETENV is defined . if defined(CMAKE_TESTING_SETENV) @@ -207,7 +207,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} && \ - ${_CMAKE_TESTING_SETENV} ${WRK_ENV} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${CMAKE_TESTING_PARALLEL_LEVEL} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} + ${_CMAKE_TESTING_SETENV} ${WRK_ENV} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${CMAKE_TESTING_JOBS} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} . endif . endif diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile index 2558fee6c571..1d156a594d7e 100644 --- a/chinese/libchewing/Makefile +++ b/chinese/libchewing/Makefile @@ -22,7 +22,7 @@ CMAKE_OFF= BUILD_INFO \ CMAKE_ON= BUILD_SHARED_LIBS \ NO_UNDEFINED \ WITH_SQLITE3 -CMAKE_TESTING_PARALLEL_LEVEL= 1 # https://github.com/chewing/libchewing/issues/293 +CMAKE_TESTING_JOBS= 1 # https://github.com/chewing/libchewing/issues/293 USE_LDCONFIG= yes .include diff --git a/security/mbedtls3/Makefile b/security/mbedtls3/Makefile index a8af7ddabd20..872fa89c9ac6 100644 --- a/security/mbedtls3/Makefile +++ b/security/mbedtls3/Makefile @@ -23,7 +23,7 @@ CMAKE_ON= CMAKE_BUILD_RPATH_USE_ORIGIN \ USE_SHARED_MBEDTLS_LIBRARY CMAKE_OFF= ENABLE_TESTING CMAKE_TESTING_ON= ENABLE_TESTING -CMAKE_TESTING_PARALLEL_LEVEL= 1 +CMAKE_TESTING_JOBS= 1 PORTSCOUT= limit:^${DISTVERSION:R:S/./\./g}\.