ed6d29d · unity8 · git.iko.soy

Run meta-meta tests serially

commited6d29d31f3c9f9f176d115d071863056c133a95 authorMichael Terry <mike@mterry.name> dateFri 13 Jan 2017, 10:55 (10 years ago) parent8277c02

2 files changed+10−4

unifiedsplit

cmake/modules/QmlTest.cmake+6−2

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

264264# installed system.

265265

266266function(add_meta_test TARGET_NAME)

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

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

268268

269269 add_custom_target(${TARGET_NAME})

270270

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

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

272+ if(TEST_SERIAL)

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

274+ else()

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

276+ endif()

273277

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

275279 # 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)

77add_meta_test(uitests)

88add_meta_test(xvfbuitests)

10−add_meta_test(alltests DEPENDS unittests uitests)

11−add_meta_test(xvfballtests DEPENDS unittests xvfbuitests)

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

11+# parallelized tests.

12+add_meta_test(alltests SERIAL DEPENDS unittests uitests)

13+add_meta_test(xvfballtests SERIAL DEPENDS unittests xvfbuitests)

1214

1315# Support libraries and plugins

1416add_subdirectory(mocks)