Unity 8

Merge lp:~mterry/unity8/autopkg-fixes into lp:unity8

autopkg-fixes
Merge into trunk

Proposed by Michael Terry on 2017-01-10

Status:	Superseded
Proposed branch:	lp:~mterry/unity8/autopkg-fixes
Merge into:	lp:unity8
Prerequisite:	lp:~unity-team/unity8/installed-qmltests
Diff against target:	56 lines (+12/-5) 2 files modified cmake/modules/QmlTest.cmake (+8/-3) tests/CMakeLists.txt (+4/-2)
To merge this branch:	bzr merge lp:~mterry/unity8/autopkg-fixes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-01-13
Unity Team		2017-01-10	Pending
Review via email: mp+314471@code.launchpad.net

Commit Message

Fix grouping of autopkg output and allow optionally passing arguments to installed test scripts.

Description of the Change

This just adds some fixes to the installed-qmltests branch.

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-10:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2874/rebuild

review: Approve (continuous-integration)

lp:~mterry/unity8/autopkg-fixes updated on 2017-01-13

2382. By Michael Terry on 2017-01-13: Run meta-meta tests serially

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-13:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2892/rebuild

review: Approve (continuous-integration)

lp:~mterry/unity8/autopkg-fixes updated on 2017-01-17

2383. By Michael Terry on 2017-01-17: Merge trunk

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'cmake/modules/QmlTest.cmake'
2	--- cmake/modules/QmlTest.cmake 2016-06-07 13:25:58 +0000
3	+++ cmake/modules/QmlTest.cmake 2017-01-17 13:55:39 +0000
4	@@ -264,12 +264,16 @@
5	# installed system.
6
7	function(add_meta_test TARGET_NAME)
8	- cmake_parse_arguments(TEST "" "" "DEPENDS" ${ARGN})
9	+ cmake_parse_arguments(TEST "SERIAL" "" "DEPENDS" ${ARGN})
10
11	add_custom_target(${TARGET_NAME})
12
13	set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
14	- file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")
15	+ if(TEST_SERIAL)
16	+ file(WRITE "${filename}" "#!/bin/sh\n\n")
17	+ else()
18	+ file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")
19	+ endif()
20
21	add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})
22	# else we will write the rest of the script as we add cmake targets
23	@@ -307,6 +311,7 @@
24	foreach(ONE_CMD ${TEST_COMMAND})
25	set(script "${script}'${ONE_CMD}' ")
26	endforeach()
27	+ set(script "${script}\"\$@\"") # Allow passing arguments if desired
28
29	set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
30
31	@@ -370,7 +375,7 @@
32	# add depend to the meta test script that we will install on system
33	set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${UPSTREAM_TARGET}.sh")
34	if (EXISTS "${filename}")
35	- file(APPEND "${filename}" "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/scripts/${depend}.sh\n")
36	+ file(APPEND "${filename}" "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/scripts/${depend}.sh \"\$@\" 2>&1\n")
37	endif()
38	endforeach()
39	endfunction()
40
41	=== modified file 'tests/CMakeLists.txt'
42	--- tests/CMakeLists.txt 2016-12-06 20:16:56 +0000
43	+++ tests/CMakeLists.txt 2017-01-17 13:55:39 +0000
44	@@ -7,8 +7,10 @@
45	add_meta_test(uitests)
46	add_meta_test(xvfbuitests)
47
48	-add_meta_test(alltests DEPENDS unittests uitests)
49	-add_meta_test(xvfballtests DEPENDS unittests xvfbuitests)
50	+# Run our meta-meta tests serially because we don't need to nest
51	+# parallelized tests.
52	+add_meta_test(alltests SERIAL DEPENDS unittests uitests)
53	+add_meta_test(xvfballtests SERIAL DEPENDS unittests xvfbuitests)
54
55	# Support libraries and plugins
56	add_subdirectory(mocks)