Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/disable_perflog_in_tests into lp:ubuntu-ui-toolkit/staging

  1. disable_perflog_in_tests
  2. Merge into staging
Proposed by Zsombor Egri
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1825
Merged at revision: 1826
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/disable_perflog_in_tests
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 11 lines (+1/-0)
1 file modified
tests/unit/runtest.sh (+1/-0)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/disable_perflog_in_tests
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zoltan Balogh Approve
Review via email: mp+284277@code.launchpad.net

Commit message

Disable rendering performance logs for the unit tests.

Description of the change

Disable rendering performance logs for the unit tests.

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

Go in!

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

PASSED: Continuous integration, rev:1825
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/186/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/452/console

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

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

PASSED: Continuous integration, rev:1825
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/187/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/454/console

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

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

PASSED: Continuous integration, rev:1825
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/198/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/455/console

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

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

PASSED: Continuous integration, rev:1825
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/199/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/457/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/199/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 'tests/unit/runtest.sh'
2--- tests/unit/runtest.sh 2015-12-22 08:54:34 +0000
3+++ tests/unit/runtest.sh 2016-01-28 13:09:59 +0000
4@@ -67,6 +67,7 @@
5 QML2_IMPORT_PATH=${_IMPORT_PATH} UBUNTU_UI_TOOLKIT_THEMES_PATH=${_THEMES_PATH} \
6 LD_LIBRARY_PATH=${_LIB_PATH} \
7 ALARM_BACKEND=memory SUPPRESS_DEPRECATED_NOTE=no \
8+ QT_LOGGING_RULES=ucPerformance.warning=false \
9 $_CMD $_ARGS 2>&1 | grep -v 'QFontDatabase: Cannot find font directory'
10 if [ "x$UITK_TEST_KEEP_RUNNING" != "x1" ]; then
11 ${BUILD_DIR}/tests/checkresults.sh $_XML

Subscribers

People subscribed via source and target branches