Merge lp:~jonas-drange/ubuntu-system-settings/drop-ld-preload into lp:ubuntu-system-settings

Proposed by Jonas G. Drange on 2017-04-05
Status: Merged
Approved by: Ken VanDine on 2017-04-06
Approved revision: 1773
Merged at revision: 1777
Proposed branch: lp:~jonas-drange/ubuntu-system-settings/drop-ld-preload
Merge into: lp:ubuntu-system-settings
Diff against target: 16 lines (+1/-5)
1 file modified
cmake/QmlTest.cmake (+1/-5)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-system-settings/drop-ld-preload
Reviewer Review Type Date Requested Status
Ken VanDine 2017-04-05 Approve on 2017-04-06
system-apps-ci-bot continuous-integration Approve on 2017-04-06
Review via email: mp+322030@code.launchpad.net

Commit message

fixes qml test mesa error caused by some form of change

Description of the change

fixes qml test mesa error caused by some form of change

To post a comment you must log in.

FAILED: Continuous integration, rev:1773
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/41/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2445/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2445
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2256/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2256
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2256/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2256
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2256/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2256
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2256/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2256/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2256
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2256/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/41/rebuild

review: Needs Fixing (continuous-integration)

FAILED: Continuous integration, rev:1773
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/42/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2474/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2474
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2285
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2285/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2285/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2285
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2285/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2285
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2285/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2285
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2285/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2285
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2285/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/42/rebuild

review: Needs Fixing (continuous-integration)

PASSED: Continuous integration, rev:1773
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/43/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2476
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2476
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2287
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2287/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2287
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2287/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2287
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2287/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2287
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2287/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2287
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2287/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2287
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2287/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/43/rebuild

review: Approve (continuous-integration)
Ken VanDine (ken-vandine) wrote :

Thanks, looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/QmlTest.cmake'
2--- cmake/QmlTest.cmake 2016-08-01 22:36:16 +0000
3+++ cmake/QmlTest.cmake 2017-04-05 16:39:56 +0000
4@@ -23,12 +23,8 @@
5 find_program(qmlscene_exe qmlscene)
6 find_program(gcc_exe gcc)
7
8-if (NOT ${gcc_exe} STREQUAL "")
9- exec_program(gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET)
10- set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
11-endif()
12 set(XVFB_CMD
13- env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
14+ env ${qmltest_ENVIRONMENT}
15 xvfb-run -a -s "-screen 0 640x480x24"
16 )
17

Subscribers

People subscribed via source and target branches