git.iko.soy/unity8
on xenial help sign in
Use parallel more extensively
4f3c33aMichael Terry
cmake/modules/QmlTest.cmake+1−1
compare with xenial
unifiedsplit
@@ -269,7 +269,7 @@ function(add_meta_test TARGET_NAME)
269 add_custom_target(${TARGET_NAME})
269 add_custom_target(${TARGET_NAME})
270
270
271 set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
271 set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
272− file(WRITE "${filename}" "#!/bin/sh\n\nset -e\n\n")
272+ file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")
273
273
274 add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})
274 add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})
275 # else we will write the rest of the script as we add cmake targets
275 # else we will write the rest of the script as we add cmake targets
debian/control+1
@@ -180,6 +180,7 @@ Architecture: any
180Multi-Arch: same
180Multi-Arch: same
181Pre-Depends: ${misc:Pre-Depends},
181Pre-Depends: ${misc:Pre-Depends},
182Depends: dbus-test-runner,
182Depends: dbus-test-runner,
183+ parallel,
183 qt5-default,
184 qt5-default,
184 qtdeclarative5-dev-tools,
185 qtdeclarative5-dev-tools,
185 unity8 (= ${source:Version}),
186 unity8 (= ${source:Version}),
debian/tests/control−1
@@ -1,7 +1,6 @@
1Tests: qmluitests.sh
1Tests: qmluitests.sh
2Restrictions: allow-stderr
2Restrictions: allow-stderr
3Depends: dpkg-dev,
3Depends: dpkg-dev,
4− parallel,
5 unity8-tests,
4 unity8-tests,
6
5
7Tests: autopilot.sh
6Tests: autopilot.sh
debian/tests/qmluitests.sh+1−2
@@ -8,5 +8,4 @@ DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
8
8
9export ARTIFACTS_DIR="${ADT_ARTIFACTS}"
9export ARTIFACTS_DIR="${ADT_ARTIFACTS}"
10
10
11−parallel --shebang /usr/lib/$DEB_HOST_MULTIARCH/unity8/tests/scripts/unittests.sh
11+/usr/lib/$DEB_HOST_MULTIARCH/unity8/tests/scripts/xvfballtests.sh
12−parallel --shebang --no-notice /usr/lib/$DEB_HOST_MULTIARCH/unity8/tests/scripts/xvfbuitests.sh