diff --git a/tests/features/CucumberTests.cmake b/tests/features/CucumberTests.cmake --- a/tests/features/CucumberTests.cmake +++ b/tests/features/CucumberTests.cmake @@ -11,16 +11,18 @@ add_custom_target(cucumber-run-${_testsuite} COMMAND ${cucumber-run-cmd} WORKING_DIRECTORY ${CUCUMBER_CWD} + USES_TERMINAL ) add_custom_target(cucumber-run-${_testsuite}-done COMMAND ${cucumber-run-cmd} --tags ~@wip WORKING_DIRECTORY ${CUCUMBER_CWD} + USES_TERMINAL ) # Default test target - add_test(${_testsuite}-features-done make cucumber-run-${_testsuite}-done) + add_test(${_testsuite}-features-done ${CMAKE_MAKE_PROGRAM} cucumber-run-${_testsuite}-done) @@ -32,14 +34,16 @@ add_custom_target(cucumber-akonadi-run-${_testsuite} COMMAND ${cucumber-akonadi-run-cmd} WORKING_DIRECTORY ${CUCUMBER_CWD} + USES_TERMINAL ) add_custom_target(cucumber-akonadi-run-${_testsuite}-done COMMAND ${cucumber-akonadi-run-cmd} --tags ~@wip WORKING_DIRECTORY ${CUCUMBER_CWD} + USES_TERMINAL ) # Default test target - add_test(${_testsuite}-features-done make cucumber-run-${_testsuite}-done) + add_test(${_testsuite}-features-done ${CMAKE_MAKE_PROGRAM} -C ${CMAKE_BINARY_DIR} cucumber-run-${_testsuite}-done) endforeach() endmacro() diff --git a/tests/testlib/MacroAkonadiAutoTests.cmake b/tests/testlib/MacroAkonadiAutoTests.cmake --- a/tests/testlib/MacroAkonadiAutoTests.cmake +++ b/tests/testlib/MacroAkonadiAutoTests.cmake @@ -25,8 +25,9 @@ add_custom_target(${_testname}-run COMMAND ${akonaditest-run-cmd} WORKING_DIRECTORY ${AKONADITEST_CWD} + USES_TERMINAL ) - add_test(zanshin-${_testname} make ${_testname}-run) + add_test(zanshin-${_testname} ${CMAKE_MAKE_PROGRAM} -C ${CMAKE_BINARY_DIR} ${_testname}-run) ENDFOREACH(_testname) ENDMACRO(ZANSHIN_AKONADI_AUTO_TESTS)