View | Details | Raw Unified | Return to bug 279316 | Differences between
and this patch

Collapse All | Expand All

(-)b/Mk/Uses/cmake.mk (-1 / +3 lines)
Lines 179-186 do-configure: Link Here
179
179
180
.    if !target(do-test) && ${cmake_ARGS:Mtesting}
180
.    if !target(do-test) && ${cmake_ARGS:Mtesting}
181
CMAKE_TESTING_ON?=		BUILD_TESTING
181
CMAKE_TESTING_ON?=		BUILD_TESTING
182
CMAKE_TESTING_PARALLEL_LEVEL?=	${MAKE_JOBS_NUMBER}
182
CMAKE_TESTING_TARGET?=		test
183
CMAKE_TESTING_TARGET?=		test
183
184
185
184
# Handle the option-like CMAKE_TESTING_ON and CMAKE_TESTING_OFF lists.
186
# Handle the option-like CMAKE_TESTING_ON and CMAKE_TESTING_OFF lists.
185
.      for _bool_kind in ON OFF
187
.      for _bool_kind in ON OFF
186
.        if defined(CMAKE_TESTING_${_bool_kind})
188
.        if defined(CMAKE_TESTING_${_bool_kind})
Lines 192-198 do-test: Link Here
192
	@cd ${BUILD_WRKSRC} && \
194
	@cd ${BUILD_WRKSRC} && \
193
		${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \
195
		${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \
194
		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \
196
		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \
195
		${SETENVI} ${WRK_ENV} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${_MAKE_JOBS_NUMBER} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET}
197
		${SETENVI} ${WRK_ENV} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${CMAKE_TESTING_PARALLEL_LEVEL} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET}
196
.    endif
198
.    endif
197
.  endif
199
.  endif
198
200

Return to bug 279316