git.iko.soy/unity8
on xenial help sign in
Allow passing arguments and collapse stdout and stderr so they show up like we expect
8277c02Michael Terry
cmake/modules/QmlTest.cmake+2−1
compare with xenial
unifiedsplit
@@ -307,6 +307,7 @@ function(install_test_script TARGET_NAME)
307 foreach(ONE_CMD ${TEST_COMMAND})
307 foreach(ONE_CMD ${TEST_COMMAND})
308 set(script "${script}'${ONE_CMD}' ")
308 set(script "${script}'${ONE_CMD}' ")
309 endforeach()
309 endforeach()
310+ set(script "${script}\"\$@\"") # Allow passing arguments if desired
310
311
311 set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
312 set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
312
313
@@ -370,7 +371,7 @@ function(add_meta_dependencies UPSTREAM_TARGET)
370 # add depend to the meta test script that we will install on system
371 # add depend to the meta test script that we will install on system
371 set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${UPSTREAM_TARGET}.sh")
372 set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${UPSTREAM_TARGET}.sh")
372 if (EXISTS "${filename}")
373 if (EXISTS "${filename}")
373− file(APPEND "${filename}" "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/scripts/${depend}.sh\n")
374+ file(APPEND "${filename}" "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/scripts/${depend}.sh \"\$@\" 2>&1\n")
374 endif()
375 endif()
375 endforeach()
376 endforeach()
376endfunction()
377endfunction()