Compiz

Merge lp:~vanvugt/compiz/fix-1088419 into lp:compiz/0.9.9

  1. fix-1088419
  2. Merge into 0.9.9
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3519
Merged at revision: 3520
Proposed branch: lp:~vanvugt/compiz/fix-1088419
Merge into: lp:compiz/0.9.9
Diff against target: 8 lines (+2/-0)
1 file modified
tests/system/CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1088419
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Sam Spilsbury Approve
Martin Mrazik Pending
Review via email: mp+138926@code.launchpad.net

Commit message

Don't try to build OpenGL test programs if you only have GLES.
(LP: #1088419)

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3519
http://jenkins.qa.ubuntu.com/job/compiz-ci/315/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/315/console

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

review: Approve (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

Heh. Was approved faster then my testing build on panda finished :)
It seems to work as expected. Compiz compiles, tests are passing.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/system/CMakeLists.txt'
2--- tests/system/CMakeLists.txt 2012-11-07 10:44:39 +0000
3+++ tests/system/CMakeLists.txt 2012-12-10 10:28:25 +0000
4@@ -1,2 +1,4 @@
5 add_subdirectory (xorg-gtest)
6+if (NOT USE_GLES)
7 add_subdirectory (untest)
8+endif ()

Subscribers

People subscribed via source and target branches