ed6d29d · unity8 · git.iko.soy

on xenial help sign in

Run meta-meta tests serially

ed6d29dMichael Terry10 years ago

cmake/modules/QmlTest.cmake+6−2

@@ -264,12 +264,16 @@ endfunction()

264# installed system.

265

266function(add_meta_test TARGET_NAME)

267− cmake_parse_arguments(TEST "" "" "DEPENDS" ${ARGN})

267+ cmake_parse_arguments(TEST "SERIAL" "" "DEPENDS" ${ARGN})

268

269 add_custom_target(${TARGET_NAME})

270

271 set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")

272+ if(TEST_SERIAL)

273+ file(WRITE "${filename}" "#!/bin/sh\n\n")

274+ else()

272− file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")

275+ file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")

276+ endif()

273

277

274 add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})

278 add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})

275 # else we will write the rest of the script as we add cmake targets

279 # else we will write the rest of the script as we add cmake targets

tests/CMakeLists.txt+4−2

@@ -7,8 +7,10 @@ add_meta_test(unittests)

7add_meta_test(uitests)

8add_meta_test(xvfbuitests)

10+# Run our meta-meta tests serially because we don't need to nest

11+# parallelized tests.

10−add_meta_test(alltests DEPENDS unittests uitests)

12+add_meta_test(alltests SERIAL DEPENDS unittests uitests)

11−add_meta_test(xvfballtests DEPENDS unittests xvfbuitests)

13+add_meta_test(xvfballtests SERIAL DEPENDS unittests xvfbuitests)

13# Support libraries and plugins

15# Support libraries and plugins

14add_subdirectory(mocks)

16add_subdirectory(mocks)