Use parallel more extensively
commit4f3c33a02e5b378a97ea288a9ce0f895c6f6ee67
authorMichael Terry <michael.terry@canonical.com>
dateFri 3 Jun 2016, 09:39 (10 years ago)
parent95f29ac
cmake/modules/QmlTest.cmake+1−1
@@ -269,7 +269,7 @@ function(add_meta_test TARGET_NAME)
269269 add_custom_target(${TARGET_NAME})
270270
271271 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")
273273
274274 add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})
275275 # else we will write the rest of the script as we add cmake targets
debian/control+1
@@ -180,6 +180,7 @@ Architecture: any
180180Multi-Arch: same
181181Pre-Depends: ${misc:Pre-Depends},
182182Depends: dbus-test-runner,
183+ parallel,
183184 qt5-default,
184185 qtdeclarative5-dev-tools,
185186 unity8 (= ${source:Version}),
debian/tests/control−1
@@ -1,7 +1,6 @@
11Tests: qmluitests.sh
22Restrictions: allow-stderr
33Depends: dpkg-dev,
4− parallel,
54 unity8-tests,
65
76Tests: autopilot.sh
debian/tests/qmluitests.sh+1−2
@@ -8,5 +8,4 @@ DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
88
99export ARTIFACTS_DIR="${ADT_ARTIFACTS}"
1010
11−parallel --shebang /usr/lib/$DEB_HOST_MULTIARCH/unity8/tests/scripts/unittests.sh
12−parallel --shebang --no-notice /usr/lib/$DEB_HOST_MULTIARCH/unity8/tests/scripts/xvfbuitests.sh
11+/usr/lib/$DEB_HOST_MULTIARCH/unity8/tests/scripts/xvfballtests.sh