Merge lp:~aacid/unity8/fix-1660576 into lp:unity8

Proposed by Albert Astals Cid on 2017-01-31
Status: Merged
Approved by: Michael Terry on 2017-01-31
Approved revision: 2801
Merged at revision: 2831
Proposed branch: lp:~aacid/unity8/fix-1660576
Merge into: lp:unity8
Diff against target: 13 lines (+6/-0)
1 file modified
tests/mocks/Unity/CMakeLists.txt (+6/-0)
To merge this branch: bzr merge lp:~aacid/unity8/fix-1660576
Reviewer Review Type Date Requested Status
Michael Terry 2017-01-31 Approve on 2017-01-31
Unity8 CI Bot continuous-integration Approve on 2017-01-31
Review via email: mp+316011@code.launchpad.net

Commit message

Serialize two make targets that want to cp to the same target file

Whitout it, running
   while [ true ]; do rm -f qmldir; make -j4 all; if [ $? -ne 0 ]; then break; fi; done
in builddir/tests/mocks/Unity eventually fails.

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2801
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3092/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4020
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2356
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2356
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4048
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3892/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Michael Terry (mterry) wrote :

Sure, not great, but harmless as well. No cleaner way to avoid writing the file twice?

review: Approve
Albert Astals Cid (aacid) wrote :

> Sure, not great, but harmless as well. No cleaner way to avoid writing the
> file twice?

figuring out why autopilot tests seem to need a copy of the same thing on a different folder, but to be honest that was something i didn't feel like tackling.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/mocks/Unity/CMakeLists.txt'
2--- tests/mocks/Unity/CMakeLists.txt 2017-01-10 14:47:07 +0000
3+++ tests/mocks/Unity/CMakeLists.txt 2017-01-31 13:46:48 +0000
4@@ -73,3 +73,9 @@
5
6 # and one copy in a separate directory for autopilot
7 add_unity8_mock(Unity 0.2 Unity PREFIX scopefakes TARGETS FakeUnityQml)
8+
9+# Since on build both copy the same file to the same location (not great)
10+# make sure one depends on the other, otherwise when running with make -jX
11+# we can get errors of cp complaining the file has been created while it
12+# was trying to create it
13+add_dependencies(scopefakes-MockUnity-qmlfiles mocks-MockUnity-qmlfiles)

Subscribers

People subscribed via source and target branches