Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/mergeUnits into lp:ubuntu-ui-toolkit/staging

  1. mergeUnits
  2. Merge into staging
Proposed by Cris Dywan
Status: Merged
Approved by: Tim Peeters
Approved revision: 1995
Merged at revision: 1992
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/mergeUnits
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 630 lines (+130/-105)
34 files modified
.bzrignore (+47/-10)
tests/checkresults.sh (+10/-9)
tests/tests.pro (+1/-1)
tests/unit/animator/animator.pro (+1/-1)
tests/unit/asyncloader/asyncloader.pro (+1/-1)
tests/unit/bottomedge/bottomedge.pro (+1/-1)
tests/unit/components/components.pro (+0/-2)
tests/unit/components/tst_pagestack_deprecated_toolbar.qml (+1/-1)
tests/unit/deprecated_theme_engine/deprecated_theme_engine.pro (+1/-1)
tests/unit/i18n/i18n.pro (+2/-2)
tests/unit/iconprovider/iconprovider.pro (+1/-1)
tests/unit/inversemousearea/inversemousearea.pro (+1/-1)
tests/unit/layouts/layouts.pro (+1/-1)
tests/unit/mousefilters/mousefilters.pro (+1/-1)
tests/unit/orientation/orientation.pro (+1/-1)
tests/unit/page/page.pro (+1/-1)
tests/unit/qmltemplate/qmltemplate.pro (+0/-2)
tests/unit/qmltest-include-x11.pri (+2/-2)
tests/unit/recreateview/recreateview.pro (+1/-1)
tests/unit/runtest.sh (+12/-12)
tests/unit/serviceproperties/serviceproperties.pro (+1/-1)
tests/unit/statesaver/statesaver.pro (+1/-1)
tests/unit/subtheming/subtheming.pro (+1/-1)
tests/unit/swipearea/swipearea.pro (+1/-1)
tests/unit/test-include-x11.pri (+1/-1)
tests/unit/test/test.pro (+1/-3)
tests/unit/testparser/testparser.pro (+0/-1)
tests/unit/theme/theme.pro (+0/-2)
tests/unit/touchregistry/touchregistry.pro (+1/-1)
tests/unit/ubuntu_shape/ubuntu_shape.pro (+1/-1)
tests/unit/unit.pro (+33/-14)
tests/unit/visual/visual.pro (+2/-4)
tests/unit_x11/unit_x11.pro (+0/-21)
ubuntu-sdk.pro (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/mergeUnits
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Tim Peeters Approve
Review via email: mp+296050@code.launchpad.net

Commit message

Merge tests/unit and tests/unit_x11

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1988
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/612/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3441/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/612/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1988
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/856/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3442/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/856/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1988
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/637/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3443/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/637/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1988
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/826/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3444/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/826/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1988
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/411/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/826
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/826/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/856
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/637
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/612
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3445/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3444
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3442
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3443
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3441

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/411/rebuild

review: Approve (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/mergeUnits updated
1989. By Cris Dywan

Drop redundant tst_ prefix everywhere but .qml unit tests

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1989
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/857/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3447/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/857/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1989
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/638/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3448/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/638/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1989
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/613/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3449/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/613/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1989
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/827/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3450/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/827/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1989
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/412/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/827
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/827/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/857
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/638/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/613
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3451/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3450
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3447
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3448
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3449

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/412/rebuild

review: Needs Fixing (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/mergeUnits updated
1990. By Cris Dywan

No need for a test_ prefix on .xml files either

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1990
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/858/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3452/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/858/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1990
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/639/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3453/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/639/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1990
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/614/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3454/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/614/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1990
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/828/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3455/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/828/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1990
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/413/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/828
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/828/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/858
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/639/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/614
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3456/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3455
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3452
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3453
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3454

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/413/rebuild

review: Needs Fixing (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/mergeUnits updated
1991. By Cris Dywan

include-x11 now sits side by site with plugin-dependency

1992. By Cris Dywan

Correct .xml file pattern in .bzrignore

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1992
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/859/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3457/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/859/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1992
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/615/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3458/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/615/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1992
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/640/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3459/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/640/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1992
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/829/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3460/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/829/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1992
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/414/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/829
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/829/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/859
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/640/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/615
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3461/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3460
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3457
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3459
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3458

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/414/rebuild

review: Needs Fixing (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/mergeUnits updated
1993. By Cris Dywan

runtest.sh shouldn't be using examples with tst_ anymore

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1993
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/860/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3462/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/860/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1993
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/641/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3463/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/641/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1993
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/616/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3464/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/616/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1993
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/830/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3465/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/830/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1993
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/415/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/830
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/830/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/860
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/641/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/616
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3466/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3465
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3462
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3463
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3464

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/415/rebuild

review: Needs Fixing (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/mergeUnits updated
1994. By Cris Dywan

Add exception for tst_textinput_touch which is flaky

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1994
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/617/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3467/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/617/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1994
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/861/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3468/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/861/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1994
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/642/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3469/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/642/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1994
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/831/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3470/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/831/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1994
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/416/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/831
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/831/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/861
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/642
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/617
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3471/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3470
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3468
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3469
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3467

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/416/rebuild

review: Approve (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

One inline comment below

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/mergeUnits updated
1995. By Cris Dywan

unit/tst_visual should be referred to as unit/visual now

Revision history for this message
Tim Peeters (tpeeters) wrote :

Thanks, looks good. Happroving.

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/875/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3537/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/875/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/657/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3538/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/657/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/876/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3539/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/876/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/658/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3540/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/658/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/847/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3541/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/847/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/846/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3542/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/846/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/631/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3543/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/631/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/426/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/846
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/846/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/875
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/657
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/631/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3544/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3542
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3537
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3538
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3543

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/426/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/632/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3545/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/632/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2015-11-30 15:39:52 +0000
3+++ .bzrignore 2016-06-03 15:39:58 +0000
4@@ -3,23 +3,60 @@
5 .qmake.cache
6 .rcc
7 qml
8+include
9+lib
10+mkspecs/*
11
12 Makefile*
13 documentation/html/*
14 *.moc
15 moc_*.cpp
16 qrc_tst_*.cpp
17-tests/test_tst_*.xml
18-tests/tst_*.qml.xml
19-tests/unit*/tst_*/tst_*
20-tests/unit/tst_*/tst_*/tst_*
21-tests/unit*/testparser/testparser
22+
23+tests/*.xml
24 plugins.qmltypes
25-po/*.mo
26-examples/ubuntu-ui-toolkit-gallery/po/*.mo
27-tests/unit/tst_i18n/tst_*/*/share/locale/en/LC_MESSAGES/*.mo
28-tests/unit/tst_i18n/*/share/locale/en/LC_MESSAGES/*.mo
29-tests/unit/tst_units/dpr*/dpr*
30+*.mo
31 apicheck/apicheck
32 ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher
33 build_paths.inc
34+
35+components.api.new
36+app-launch-profiler/app-launch-tracepoints
37+tests/unit/alarms/alarms
38+tests/unit/animator/animator
39+tests/unit/argument/argument
40+tests/unit/arguments/arguments
41+tests/unit/asyncloader/asyncloader
42+tests/unit/bottomedge/bottomedge
43+tests/unit/components/components
44+tests/unit/components_benchmark/components_benchmark
45+tests/unit/deprecated_theme_engine/deprecated_theme_engine
46+tests/unit/i18n/LocalizedApp/LocalizedApp
47+tests/unit/i18n/RelativeTime/RelativeTime
48+tests/unit/iconprovider/iconprovider
49+tests/unit/inversemousearea/inversemousearea
50+tests/unit/layouts/layouts
51+tests/unit/mainview/mainview
52+tests/unit/mousefilters/mousefilters
53+tests/unit/orientation/orientation
54+tests/unit/page/page
55+tests/unit/performance/performance
56+tests/unit/qquick_image_extension/qquick_image_extension
57+tests/unit/quickutils/quickutils
58+tests/unit/recreateview/recreateview
59+tests/unit/scaling_image_provider/scaling_image_provider
60+tests/unit/serviceproperties/serviceproperties
61+tests/unit/statesaver/statesaver
62+tests/unit/subtheming/subtheming
63+tests/unit/swipearea/swipearea
64+tests/unit/test/test
65+tests/unit/testparser/testparser
66+tests/unit/theme/theme
67+tests/unit/touchregistry/touchregistry
68+tests/unit/tree/tree
69+tests/unit/ubuntu_shape/ubuntu_shape
70+tests/unit/units/dpr1/dpr1
71+tests/unit/units/dpr2/dpr2
72+tests/unit/units/dpr3/dpr3
73+tests/unit/units/scale/scale
74+tests/unit/visual/visual
75
76=== modified file 'tests/checkresults.sh'
77--- tests/checkresults.sh 2016-04-13 09:51:21 +0000
78+++ tests/checkresults.sh 2016-06-03 15:39:58 +0000
79@@ -24,34 +24,35 @@
80 FATAL_WARNINGS=0
81 EXCEPTED=0
82 for _XML in $*; do
83- _TESTNAME=$(basename $_XML | sed -r 's@test_(.+)\.xml@\1@' -)
84+ _TESTNAME=$(basename $_XML | sed -r 's@(.+)\.xml@\1@' -)
85
86 if [ ! -f $_XML ]; then
87 echo "$_XML doesn't exist"
88 exit 1
89 fi
90
91- EXCEPTIONS='tst_components_benchmark \
92+ EXCEPTIONS='components_benchmark \
93 tst_tabbar.qml \
94 tst_datepicker12.bug1567840.SEGFAULT.qml \
95 tst_datepicker13.bug1567840.SEGFAULT.qml \
96- tst_swipearea \
97- tst_qquick_image_extension \
98+ tst_textinput_touch.SEGFAULT.qml \
99+ swipearea \
100+ qquick_image_extension \
101 tst_page.qml \
102 tst_toolbar.qml \
103 tst_label13.qml \
104- tst_performance \
105+ performance \
106 tst_tabs.qml \
107 tst_focus.qml \
108 tst_pickerpanel.qml \
109 tst_picker.qml \
110 tst_picker13.qml \
111- tst_recreateview \
112- tst_touchregistry \
113- tst_mainview \
114+ recreateview \
115+ touchregistry \
116+ mainview \
117 tst_listitems_itemselector.qml \
118 tst_tabs_with_repeater.deprecated_toolbar.qml \
119- tst_inversemousearea \
120+ inversemousearea \
121 '
122
123 WARNINGS=$(grep -c -P "$WARNINGS_PATTERN" $_XML)
124
125=== modified file 'tests/tests.pro'
126--- tests/tests.pro 2016-05-17 09:15:17 +0000
127+++ tests/tests.pro 2016-06-03 15:39:58 +0000
128@@ -1,5 +1,5 @@
129 TEMPLATE = subdirs
130-SUBDIRS += unit unit_x11 autopilot
131+SUBDIRS += unit autopilot
132
133 autopilot_module.path = $$[QT_INSTALL_PREFIX]/lib/python3/dist-packages/ubuntuuitoolkit
134 autopilot_module.files = autopilot/ubuntuuitoolkit/*
135
136=== renamed file 'tests/unit_x11/add_makecheck.pri' => 'tests/unit/add_makecheck_x11.pri'
137=== renamed file 'tests/unit_x11/add_qmlmakecheck.pri' => 'tests/unit/add_qmlmakecheck_x11.pri'
138=== renamed directory 'tests/unit/tst_alarms' => 'tests/unit/alarms'
139=== renamed file 'tests/unit/tst_alarms/tst_alarms.pro' => 'tests/unit/alarms/alarms.pro'
140=== renamed directory 'tests/unit_x11/tst_animator' => 'tests/unit/animator'
141=== renamed file 'tests/unit_x11/tst_animator/tst_animator.pro' => 'tests/unit/animator/animator.pro'
142--- tests/unit_x11/tst_animator/tst_animator.pro 2016-03-14 14:33:15 +0000
143+++ tests/unit/animator/animator.pro 2016-06-03 15:39:58 +0000
144@@ -1,4 +1,4 @@
145-include(../test-include.pri)
146+include(../test-include-x11.pri)
147 QT += core-private qml-private quick-private gui-private
148
149 CONFIG += c++11
150
151=== renamed directory 'tests/unit/tst_argument' => 'tests/unit/argument'
152=== renamed file 'tests/unit/tst_argument/tst_argument.pro' => 'tests/unit/argument/argument.pro'
153=== renamed directory 'tests/unit/tst_arguments' => 'tests/unit/arguments'
154=== renamed file 'tests/unit/tst_arguments/tst_arguments.pro' => 'tests/unit/arguments/arguments.pro'
155=== renamed directory 'tests/unit_x11/tst_asyncloader' => 'tests/unit/asyncloader'
156=== renamed file 'tests/unit_x11/tst_asyncloader/tst_asyncloader.pro' => 'tests/unit/asyncloader/asyncloader.pro'
157--- tests/unit_x11/tst_asyncloader/tst_asyncloader.pro 2016-02-18 15:53:42 +0000
158+++ tests/unit/asyncloader/asyncloader.pro 2016-06-03 15:39:58 +0000
159@@ -1,4 +1,4 @@
160-include(../test-include.pri)
161+include(../test-include-x11.pri)
162 QT += core-private qml-private quick-private gui-private UbuntuToolkit
163
164 SOURCES += \
165
166=== renamed directory 'tests/unit_x11/tst_bottomedge' => 'tests/unit/bottomedge'
167=== renamed file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.pro' => 'tests/unit/bottomedge/bottomedge.pro'
168--- tests/unit_x11/tst_bottomedge/tst_bottomedge.pro 2016-04-01 13:16:05 +0000
169+++ tests/unit/bottomedge/bottomedge.pro 2016-06-03 15:39:58 +0000
170@@ -1,4 +1,4 @@
171-include(../test-include.pri)
172+include(../test-include-x11.pri)
173 QT += core-private qml-private quick-private gui-private UbuntuGestures UbuntuGestures_private UbuntuToolkit
174
175 SOURCES += \
176
177=== renamed directory 'tests/unit/tst_components' => 'tests/unit/components'
178=== renamed file 'tests/unit/tst_components/tst_components.pro' => 'tests/unit/components/components.pro'
179--- tests/unit/tst_components/tst_components.pro 2015-04-25 05:31:43 +0000
180+++ tests/unit/components/components.pro 2016-06-03 15:39:58 +0000
181@@ -2,8 +2,6 @@
182
183 include(../qmltest-include.pri)
184
185-TARGET = tst_components
186-
187 SOURCES += tst_components.cpp
188
189 OTHER_FILES += $$system(ls *.qml) \
190
191=== modified file 'tests/unit/components/tst_pagestack_deprecated_toolbar.qml'
192--- tests/unit/tst_components/tst_pagestack_deprecated_toolbar.qml 2015-03-03 13:20:06 +0000
193+++ tests/unit/components/tst_pagestack_deprecated_toolbar.qml 2016-06-03 15:39:58 +0000
194@@ -19,7 +19,7 @@
195 import Ubuntu.Components 1.1
196
197 // pagestack tests for the new header are in
198-// unit_x11/tst_components/tst_pagestack_new_header.qml
199+// unit/visual/tst_pagestack_new_header.qml
200
201 TestCase {
202 name: "PageStackAPI"
203
204=== renamed directory 'tests/unit/tst_components_benchmark' => 'tests/unit/components_benchmark'
205=== renamed file 'tests/unit/tst_components_benchmark/tst_components_benchmark.pro' => 'tests/unit/components_benchmark/components_benchmark.pro'
206=== renamed directory 'tests/unit_x11/tst_deprecated_theme_engine' => 'tests/unit/deprecated_theme_engine'
207=== renamed file 'tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro' => 'tests/unit/deprecated_theme_engine/deprecated_theme_engine.pro'
208--- tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro 2016-02-25 19:50:13 +0000
209+++ tests/unit/deprecated_theme_engine/deprecated_theme_engine.pro 2016-06-03 15:39:58 +0000
210@@ -1,4 +1,4 @@
211-include(../test-include.pri)
212+include(../test-include-x11.pri)
213 QT += quick-private gui-private qml-private
214 SOURCES += tst_deprecated_theme_engine.cpp
215
216
217=== renamed directory 'tests/unit/tst_i18n' => 'tests/unit/i18n'
218=== renamed directory 'tests/unit/tst_i18n/tst_i18n_LocalizedApp' => 'tests/unit/i18n/LocalizedApp'
219=== renamed file 'tests/unit/tst_i18n/tst_i18n_LocalizedApp/tst_i18n_LocalizedApp.pro' => 'tests/unit/i18n/LocalizedApp/LocalizedApp.pro'
220=== renamed directory 'tests/unit/tst_i18n/tst_i18n_RelativeTime' => 'tests/unit/i18n/RelativeTime'
221=== renamed file 'tests/unit/tst_i18n/tst_i18n_RelativeTime/tst_i18n_RelativeTime.pro' => 'tests/unit/i18n/RelativeTime/RelativeTime.pro'
222=== renamed file 'tests/unit/tst_i18n/tst_i18n.pro' => 'tests/unit/i18n/i18n.pro'
223--- tests/unit/tst_i18n/tst_i18n.pro 2015-08-12 10:11:06 +0000
224+++ tests/unit/i18n/i18n.pro 2016-06-03 15:39:58 +0000
225@@ -1,3 +1,3 @@
226 TEMPLATE = subdirs
227-SUBDIRS += tst_i18n_LocalizedApp
228-SUBDIRS += tst_i18n_RelativeTime
229+SUBDIRS += LocalizedApp
230+SUBDIRS += RelativeTime
231
232=== renamed directory 'tests/unit_x11/tst_iconprovider' => 'tests/unit/iconprovider'
233=== renamed file 'tests/unit_x11/tst_iconprovider/tst_iconprovider.pro' => 'tests/unit/iconprovider/iconprovider.pro'
234--- tests/unit_x11/tst_iconprovider/tst_iconprovider.pro 2015-02-18 11:39:07 +0000
235+++ tests/unit/iconprovider/iconprovider.pro 2016-06-03 15:39:58 +0000
236@@ -1,4 +1,4 @@
237-include(../test-include.pri)
238+include(../test-include-x11.pri)
239 DEFINES += SRCDIR=\\\"$$PWD/\\\"
240
241 SOURCES += \
242
243=== renamed directory 'tests/unit_x11/tst_inversemousearea' => 'tests/unit/inversemousearea'
244=== renamed file 'tests/unit_x11/tst_inversemousearea/tst_inversemousearea.pro' => 'tests/unit/inversemousearea/inversemousearea.pro'
245--- tests/unit_x11/tst_inversemousearea/tst_inversemousearea.pro 2014-04-15 21:37:57 +0000
246+++ tests/unit/inversemousearea/inversemousearea.pro 2016-06-03 15:39:58 +0000
247@@ -1,4 +1,4 @@
248-include(../test-include.pri)
249+include(../test-include-x11.pri)
250 QT += quick-private gui-private
251 SOURCES += tst_inversemouseareatest.cpp
252 DEFINES += SRCDIR=\\\"$$PWD/\\\"
253
254=== renamed file 'tests/unit_x11/layout_dependency.pri' => 'tests/unit/layout_dependency.pri'
255=== renamed directory 'tests/unit_x11/tst_layouts' => 'tests/unit/layouts'
256=== renamed file 'tests/unit_x11/tst_layouts/tst_layouts.pro' => 'tests/unit/layouts/layouts.pro'
257--- tests/unit_x11/tst_layouts/tst_layouts.pro 2014-05-16 08:33:43 +0000
258+++ tests/unit/layouts/layouts.pro 2016-06-03 15:39:58 +0000
259@@ -1,4 +1,4 @@
260-include(../test-include.pri)
261+include(../test-include-x11.pri)
262 include(../../unit/qtprivate_dependency.pri)
263
264 QT += gui
265
266=== renamed directory 'tests/unit/tst_mainview' => 'tests/unit/mainview'
267=== renamed file 'tests/unit/tst_mainview/tst_mainview.pro' => 'tests/unit/mainview/mainview.pro'
268=== renamed directory 'tests/unit_x11/tst_mousefilters' => 'tests/unit/mousefilters'
269=== renamed file 'tests/unit_x11/tst_mousefilters/tst_mousefilters.pro' => 'tests/unit/mousefilters/mousefilters.pro'
270--- tests/unit_x11/tst_mousefilters/tst_mousefilters.pro 2015-12-03 15:43:23 +0000
271+++ tests/unit/mousefilters/mousefilters.pro 2016-06-03 15:39:58 +0000
272@@ -1,4 +1,4 @@
273-include(../test-include.pri)
274+include(../test-include-x11.pri)
275 QT += quick-private
276 SOURCES += tst_mousefilterstest.cpp
277 DEFINES += SRCDIR=\\\"$$PWD/\\\"
278
279=== renamed directory 'tests/unit_x11/tst_orientation' => 'tests/unit/orientation'
280=== renamed file 'tests/unit_x11/tst_orientation/tst_orientation.pro' => 'tests/unit/orientation/orientation.pro'
281--- tests/unit_x11/tst_orientation/tst_orientation.pro 2013-10-16 15:51:22 +0000
282+++ tests/unit/orientation/orientation.pro 2016-06-03 15:39:58 +0000
283@@ -1,4 +1,4 @@
284-include(../test-include.pri)
285+include(../test-include-x11.pri)
286 DEFINES += SRCDIR=\\\"$$PWD/\\\"
287
288 SOURCES += \
289
290=== renamed directory 'tests/unit_x11/tst_page' => 'tests/unit/page'
291=== renamed file 'tests/unit_x11/tst_page/tst_page.pro' => 'tests/unit/page/page.pro'
292--- tests/unit_x11/tst_page/tst_page.pro 2013-11-08 20:19:58 +0000
293+++ tests/unit/page/page.pro 2016-06-03 15:39:58 +0000
294@@ -1,4 +1,4 @@
295-include(../test-include.pri)
296+include(../test-include-x11.pri)
297
298 QT += gui
299 SOURCES += tst_page.cpp
300
301=== renamed directory 'tests/unit/tst_performance' => 'tests/unit/performance'
302=== renamed file 'tests/unit/tst_performance/tst_performance.pro' => 'tests/unit/performance/performance.pro'
303=== renamed directory 'tests/unit/tst_qmltemplate' => 'tests/unit/qmltemplate'
304=== renamed file 'tests/unit/tst_qmltemplate/tst_qmltemplate.pro' => 'tests/unit/qmltemplate/qmltemplate.pro'
305--- tests/unit/tst_qmltemplate/tst_qmltemplate.pro 2012-12-10 12:15:49 +0000
306+++ tests/unit/qmltemplate/qmltemplate.pro 2016-06-03 15:39:58 +0000
307@@ -2,8 +2,6 @@
308
309 include(../qmltest-include.pri)
310
311-TARGET = tst_qmltemplate
312-
313 SOURCES += tst_qmltemplate.cpp
314
315 OTHER_FILES += $$system(ls *.qml)
316
317=== renamed file 'tests/unit_x11/qmltest-include.pri' => 'tests/unit/qmltest-include-x11.pri'
318--- tests/unit_x11/qmltest-include.pri 2013-10-30 13:57:33 +0000
319+++ tests/unit/qmltest-include-x11.pri 2016-06-03 15:39:58 +0000
320@@ -1,5 +1,5 @@
321-include( ../unit/plugin_dependency.pri )
322-include( add_qmlmakecheck.pri)
323+include( plugin_dependency.pri )
324+include( add_qmlmakecheck_x11.pri)
325
326 TEMPLATE = app
327 QT += qml quick qmltest
328
329=== renamed directory 'tests/unit/tst_qquick_image_extension' => 'tests/unit/qquick_image_extension'
330=== renamed file 'tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.pro' => 'tests/unit/qquick_image_extension/qquick_image_extension.pro'
331=== renamed directory 'tests/unit/tst_quickutils' => 'tests/unit/quickutils'
332=== renamed file 'tests/unit/tst_quickutils/tst_quickutils.pro' => 'tests/unit/quickutils/quickutils.pro'
333=== renamed directory 'tests/unit_x11/tst_recreateview' => 'tests/unit/recreateview'
334=== renamed file 'tests/unit_x11/tst_recreateview/tst_recreateview.pro' => 'tests/unit/recreateview/recreateview.pro'
335--- tests/unit_x11/tst_recreateview/tst_recreateview.pro 2013-09-11 06:30:02 +0000
336+++ tests/unit/recreateview/recreateview.pro 2016-06-03 15:39:58 +0000
337@@ -1,4 +1,4 @@
338-include(../test-include.pri)
339+include(../test-include-x11.pri)
340 SOURCES += tst_recreateview.cpp
341 DEFINES += SRCDIR=\\\"$$PWD/\\\"
342 OTHER_FILES += \
343
344=== modified file 'tests/unit/runtest.sh'
345--- tests/unit/runtest.sh 2016-04-13 09:51:21 +0000
346+++ tests/unit/runtest.sh 2016-06-03 15:39:58 +0000
347@@ -43,23 +43,23 @@
348 echo " $0 TEST_EXECUTABLE [QML_FILE] [QT_QPA_PLATFORM]"
349 echo ''
350 echo 'Examples:'
351- echo " $0 $(relpath ${BUILD_DIR}/tests/unit/tst_components/tst_components) tst_label13.qml minimal"
352- echo ''
353- echo " cd $(relpath ${BUILD_DIR}/tests/unit/tst_mainview)"
354- echo " ../$(basename $0) tst_mainview minimal"
355- echo " cd ../../.."
356- echo ''
357- echo " cd $(relpath ${BUILD_DIR}/tests/unit_x11/tst_components)"
358- echo " ../../xvfb.sh ../../unit/$(basename $0) tst_components tst_listitem13.qml"
359- echo " cd ../../.."
360- echo ''
361- echo " $(relpath ${BUILD_DIR}/tests/xvfb.sh) $0 $(relpath ${BUILD_DIR}/tests/unit_x11/tst_bottomedge/tst_bottomedge)"
362+ echo " $0 $(relpath ${BUILD_DIR}/tests/unit/components/components) tst_label13.qml minimal"
363+ echo ''
364+ echo " cd $(relpath ${BUILD_DIR}/tests/unit/mainview)"
365+ echo " ../$(basename $0) mainview minimal"
366+ echo " cd ../../.."
367+ echo ''
368+ echo " cd $(relpath ${BUILD_DIR}/tests/unit/visual)"
369+ echo " ../../xvfb.sh ../../unit/$(basename $0) visual tst_listitem13.qml"
370+ echo " cd ../../.."
371+ echo ''
372+ echo " $(relpath ${BUILD_DIR}/tests/xvfb.sh) $0 $(relpath ${BUILD_DIR}/tests/unit/bottomedge/bottomedge)"
373 exit 1
374 fi
375
376 _TARGET=$(basename $_TARGETPATH)
377 _TESTFILE=$(basename $_TESTFILEPATH)
378-_XML="${BUILD_DIR}/tests/test_$_TARGET_$_TESTFILE.xml"
379+_XML="${BUILD_DIR}/tests/$_TARGET_$_TESTFILE.xml"
380
381 _ARGS="-p -o -p $_XML,xunitxml -p -o -p -,txt"
382
383
384=== renamed directory 'tests/unit/tst_scaling_image_provider' => 'tests/unit/scaling_image_provider'
385=== renamed file 'tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.pro' => 'tests/unit/scaling_image_provider/scaling_image_provider.pro'
386=== renamed directory 'tests/unit_x11/tst_serviceproperties' => 'tests/unit/serviceproperties'
387=== renamed file 'tests/unit_x11/tst_serviceproperties/tst_serviceproperties.pro' => 'tests/unit/serviceproperties/serviceproperties.pro'
388--- tests/unit_x11/tst_serviceproperties/tst_serviceproperties.pro 2014-11-27 13:01:56 +0000
389+++ tests/unit/serviceproperties/serviceproperties.pro 2016-06-03 15:39:58 +0000
390@@ -1,4 +1,4 @@
391-include(../test-include.pri)
392+include(../test-include-x11.pri)
393 SOURCES += \
394 tst_serviceproperties.cpp
395
396
397=== renamed directory 'tests/unit_x11/tst_statesaver' => 'tests/unit/statesaver'
398=== renamed file 'tests/unit_x11/tst_statesaver/tst_statesaver.pro' => 'tests/unit/statesaver/statesaver.pro'
399--- tests/unit_x11/tst_statesaver/tst_statesaver.pro 2014-07-28 14:46:19 +0000
400+++ tests/unit/statesaver/statesaver.pro 2016-06-03 15:39:58 +0000
401@@ -1,4 +1,4 @@
402-include(../test-include.pri)
403+include(../test-include-x11.pri)
404 DEFINES += SRCDIR=\\\"$$PWD/\\\"
405
406 SOURCES += \
407
408=== renamed directory 'tests/unit_x11/tst_subtheming' => 'tests/unit/subtheming'
409=== renamed file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro' => 'tests/unit/subtheming/subtheming.pro'
410--- tests/unit_x11/tst_subtheming/tst_subtheming.pro 2016-03-14 17:08:59 +0000
411+++ tests/unit/subtheming/subtheming.pro 2016-06-03 15:39:58 +0000
412@@ -1,4 +1,4 @@
413-include(../test-include.pri)
414+include(../test-include-x11.pri)
415 QT += core-private qml-private quick-private gui-private
416 SOURCES += tst_subtheming.cpp
417
418
419=== renamed directory 'tests/unit_x11/tst_swipearea' => 'tests/unit/swipearea'
420=== renamed file 'tests/unit_x11/tst_swipearea/tst_swipearea.pro' => 'tests/unit/swipearea/swipearea.pro'
421--- tests/unit_x11/tst_swipearea/tst_swipearea.pro 2015-12-17 15:23:26 +0000
422+++ tests/unit/swipearea/swipearea.pro 2016-06-03 15:39:58 +0000
423@@ -1,4 +1,4 @@
424-include(../test-include.pri)
425+include(../test-include-x11.pri)
426 QT += core-private qml-private quick-private gui-private UbuntuGestures UbuntuGestures_private
427 SOURCES += \
428 GestureTest.cpp \
429
430=== renamed directory 'tests/unit/tst_template' => 'tests/unit/template'
431=== renamed file 'tests/unit/tst_template/tst_template.pro' => 'tests/unit/template/template.pro'
432=== renamed directory 'tests/unit_x11/tst_test' => 'tests/unit/test'
433=== renamed file 'tests/unit_x11/test-include.pri' => 'tests/unit/test-include-x11.pri'
434--- tests/unit_x11/test-include.pri 2015-10-21 08:33:21 +0000
435+++ tests/unit/test-include-x11.pri 2016-06-03 15:39:58 +0000
436@@ -1,6 +1,6 @@
437 include( ../unit/plugin_dependency.pri )
438 include( layout_dependency.pri )
439-include( add_makecheck.pri )
440+include( add_makecheck_x11.pri )
441
442 TEMPLATE = app
443 QT += testlib qml quick
444
445=== renamed file 'tests/unit_x11/tst_test/tst_test.pro' => 'tests/unit/test/test.pro'
446--- tests/unit_x11/tst_test/tst_test.pro 2013-07-24 12:34:45 +0000
447+++ tests/unit/test/test.pro 2016-06-03 15:39:58 +0000
448@@ -1,8 +1,6 @@
449 TESTS += $$system(ls tst_*.qml)
450
451-include(../qmltest-include.pri)
452-
453-TARGET = tst_test
454+include(../qmltest-include-x11.pri)
455
456 SOURCES += tst_test.cpp
457
458
459=== modified file 'tests/unit/testparser/testparser.pro'
460--- tests/unit/testparser/testparser.pro 2012-11-28 20:31:53 +0000
461+++ tests/unit/testparser/testparser.pro 2016-06-03 15:39:58 +0000
462@@ -2,7 +2,6 @@
463
464 QT -= gui
465
466-TARGET = testparser
467 CONFIG += console
468 CONFIG -= app_bundle
469
470
471=== renamed directory 'tests/unit/tst_theme' => 'tests/unit/theme'
472=== renamed file 'tests/unit/tst_theme/tst_theme.pro' => 'tests/unit/theme/theme.pro'
473--- tests/unit/tst_theme/tst_theme.pro 2013-08-28 09:49:02 +0000
474+++ tests/unit/theme/theme.pro 2016-06-03 15:39:58 +0000
475@@ -2,8 +2,6 @@
476
477 include(../qmltest-include.pri)
478
479-TARGET = tst_theme
480-
481 SOURCES += tst_theme.cpp
482
483 OTHER_FILES += $$system(ls *.qml)
484
485=== renamed directory 'tests/unit_x11/tst_touchregistry' => 'tests/unit/touchregistry'
486=== renamed file 'tests/unit_x11/tst_touchregistry/tst_touchregistry.pro' => 'tests/unit/touchregistry/touchregistry.pro'
487--- tests/unit_x11/tst_touchregistry/tst_touchregistry.pro 2015-11-09 15:46:45 +0000
488+++ tests/unit/touchregistry/touchregistry.pro 2016-06-03 15:39:58 +0000
489@@ -1,4 +1,4 @@
490-include(../test-include.pri)
491+include(../test-include-x11.pri)
492
493 QT += core-private qml-private quick-private gui-private UbuntuGestures
494
495
496=== renamed directory 'tests/unit/tst_tree' => 'tests/unit/tree'
497=== renamed file 'tests/unit/tst_tree/tst_tree.pro' => 'tests/unit/tree/tree.pro'
498=== renamed directory 'tests/unit_x11/tst_ubuntu_shape' => 'tests/unit/ubuntu_shape'
499=== renamed file 'tests/unit_x11/tst_ubuntu_shape/tst_ubuntu_shape.pro' => 'tests/unit/ubuntu_shape/ubuntu_shape.pro'
500--- tests/unit_x11/tst_ubuntu_shape/tst_ubuntu_shape.pro 2013-04-24 12:44:23 +0000
501+++ tests/unit/ubuntu_shape/ubuntu_shape.pro 2016-06-03 15:39:58 +0000
502@@ -1,4 +1,4 @@
503-include(../test-include.pri)
504+include(../test-include-x11.pri)
505 SOURCES += tst_ubuntu_shape.cpp
506 OTHER_FILES += no_distortion.qml \
507 no_distortion_source.png \
508
509=== modified file 'tests/unit/unit.pro'
510--- tests/unit/unit.pro 2016-02-25 11:56:23 +0000
511+++ tests/unit/unit.pro 2016-06-03 15:39:58 +0000
512@@ -10,21 +10,40 @@
513 # https://bugs.launchpad.net/qemu-linaro/+bug/1084148
514 #######################################
515 #!contains(QMAKE_HOST.arch,armv7l) {
516- SUBDIRS += tst_components \
517- tst_components_benchmark
518+ SUBDIRS += components \
519+ components_benchmark
520 #}
521
522 SUBDIRS += \
523+ visual \
524+ ubuntu_shape \
525+ page \
526+ test \
527+ iconprovider \
528+ inversemousearea \
529+ recreateview \
530+ statesaver \
531+ deprecated_theme_engine \
532+ orientation \
533+ layouts \
534+ mousefilters \
535+ animator \
536+ serviceproperties \
537+ subtheming \
538+ swipearea \
539+ touchregistry \
540+ bottomedge \
541+ asyncloader \
542 custom_qpa \
543- tst_units \
544- tst_scaling_image_provider \
545- tst_qquick_image_extension \
546- tst_performance \
547- tst_mainview \
548- tst_i18n \
549- tst_arguments \
550- tst_argument \
551- tst_alarms \
552- tst_theme \
553- tst_quickutils \
554- tst_tree
555+ units \
556+ scaling_image_provider \
557+ qquick_image_extension \
558+ performance \
559+ mainview \
560+ i18n \
561+ arguments \
562+ argument \
563+ alarms \
564+ theme \
565+ quickutils \
566+ tree
567
568=== renamed directory 'tests/unit/tst_units' => 'tests/unit/units'
569=== renamed file 'tests/unit/tst_units/tst_units.pro' => 'tests/unit/units/units.pro'
570=== renamed directory 'tests/unit_x11/tst_components' => 'tests/unit/visual'
571=== renamed file 'tests/unit_x11/tst_components/tst_textinput_touch.qml' => 'tests/unit/visual/tst_textinput_touch.SEGFAULT.qml'
572=== renamed file 'tests/unit_x11/tst_components/tst_components.cpp' => 'tests/unit/visual/tst_visual.cpp'
573=== renamed file 'tests/unit_x11/tst_components/tst_components.pro' => 'tests/unit/visual/visual.pro'
574--- tests/unit_x11/tst_components/tst_components.pro 2016-05-13 08:39:18 +0000
575+++ tests/unit/visual/visual.pro 2016-06-03 15:39:58 +0000
576@@ -1,12 +1,10 @@
577 TESTS += $$system(ls tst_*.qml)
578
579-include(../qmltest-include.pri)
580-
581-TARGET = tst_components
582+include(../qmltest-include-x11.pri)
583
584 CONFIG += c++11
585
586-SOURCES += tst_components.cpp tabsmodel.cpp
587+SOURCES += tst_visual.cpp tabsmodel.cpp
588 HEADERS += tabsmodel.h
589
590 OTHER_FILES += $$system(ls *.qml)
591
592=== removed directory 'tests/unit_x11'
593=== removed file 'tests/unit_x11/unit_x11.pro'
594--- tests/unit_x11/unit_x11.pro 2016-02-18 15:42:06 +0000
595+++ tests/unit_x11/unit_x11.pro 1970-01-01 00:00:00 +0000
596@@ -1,21 +0,0 @@
597-TEMPLATE = subdirs
598-
599-SUBDIRS += tst_components \
600- tst_ubuntu_shape \
601- tst_page \
602- tst_test \
603- tst_iconprovider \
604- tst_inversemousearea \
605- tst_recreateview \
606- tst_statesaver \
607- tst_deprecated_theme_engine \
608- tst_orientation \
609- tst_layouts \
610- tst_mousefilters \
611- tst_animator \
612- tst_serviceproperties \
613- tst_subtheming \
614- tst_swipearea \
615- tst_touchregistry \
616- tst_bottomedge \
617- tst_asyncloader
618
619=== modified file 'ubuntu-sdk.pro'
620--- ubuntu-sdk.pro 2016-04-22 15:50:19 +0000
621+++ ubuntu-sdk.pro 2016-06-03 15:39:58 +0000
622@@ -27,7 +27,7 @@
623 QMAKE_EXTRA_TARGETS += license
624
625 check.target = check
626-check.commands = $$PWD/tests/checkresults.sh $$OUT_PWD/tests/test_*.xml || exit 1;
627+check.commands = $$PWD/tests/checkresults.sh $$OUT_PWD/tests/*.xml || exit 1;
628 check.commands += pep8 $$PWD || exit 1;
629
630 #helper files

Subscribers

People subscribed via source and target branches