Compiz

Merge lp:~compiz-team/compiz/compiz.fix_1120009.1 into lp:compiz/0.9.9

  1. compiz.fix_1120009.1
  2. Merge into 0.9.9
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1120009.1
Merge into: lp:compiz/0.9.9
Diff against target: 33 lines (+3/-2)
2 files modified
debian/control (+1/-0)
tests/system/xorg-gtest/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1120009.1
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
MC Return Approve
Compiz Maintainers Pending
Review via email: mp+147539@code.launchpad.net

This proposal supersedes a proposal from 2013-02-10.

This proposal has been superseded by a proposal from 2013-02-12.

Commit message

Enable xorg-gtest tests by default and build in CI

(LP: #1120009)

Description of the change

Enable xorg-gtest tests by default and build in CI

(LP: #1120009)

To post a comment you must log in.
Revision history for this message
MC Return (mc-return) wrote :

More useful tests can only be good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3555
http://jenkins.qa.ubuntu.com/job/compiz-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=quantal,flavor=amd64/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=quantal,flavor=amd64/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=quantal,flavor=amd64/398/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/9//rebuild/?

review: Needs Fixing (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2012-11-05 21:35:41 +0000
+++ debian/control 2013-02-10 05:03:20 +0000
@@ -54,6 +54,7 @@
54 python-pyrex,54 python-pyrex,
55 gnome-control-center-dev,55 gnome-control-center-dev,
56 gsettings-desktop-schemas-dev,56 gsettings-desktop-schemas-dev,
57 libxorg-gtest-dev,
57Standards-Version: 3.9.358Standards-Version: 3.9.3
58# If you aren't a member of ~compiz-team but need to upload packaging changes,59# If you aren't a member of ~compiz-team but need to upload packaging changes,
59# just go ahead. ~compiz-team will notice and sync up the code again.60# just go ahead. ~compiz-team will notice and sync up the code again.
6061
=== modified file 'tests/system/xorg-gtest/CMakeLists.txt'
--- tests/system/xorg-gtest/CMakeLists.txt 2012-11-28 14:33:20 +0000
+++ tests/system/xorg-gtest/CMakeLists.txt 2013-02-10 05:03:20 +0000
@@ -2,7 +2,7 @@
22
3pkg_check_modules (XORG_SERVER xorg-gtest xorg-server x11)3pkg_check_modules (XORG_SERVER xorg-gtest xorg-server x11)
44
5option (BUILD_XORG_GTEST "Build Xorg GTest integration tests" OFF)5option (BUILD_XORG_GTEST "Build Xorg GTest integration tests" ON)
66
7if (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)7if (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
88
@@ -27,7 +27,7 @@
2727
28else (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)28else (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
2929
30 message (WARNING "Could not found xorg-gtest, not building system tests")30 message (WARNING "Not building xorg-gtest tests")
31 set (BUILD_XORG_GTEST OFF)31 set (BUILD_XORG_GTEST OFF)
3232
33endif (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)33endif (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)

Subscribers

People subscribed via source and target branches