Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.fix_1041535 into lp://qastaging/compiz/0.9.8

  1. compiz.fix_1041535
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Rejected
Rejected by: Sam Spilsbury
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.fix_1041535
Merge into: lp://qastaging/compiz/0.9.8
Diff against target: 144 lines (+38/-25)
8 files modified
plugins/composite/CMakeLists.txt (+5/-4)
plugins/decor/CMakeLists.txt (+4/-2)
plugins/expo/CMakeLists.txt (+4/-3)
plugins/grid/CMakeLists.txt (+5/-4)
plugins/opengl/CMakeLists.txt (+4/-2)
plugins/place/CMakeLists.txt (+8/-6)
plugins/resize/CMakeLists.txt (+4/-2)
plugins/wall/CMakeLists.txt (+4/-2)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.fix_1041535
Reviewer Review Type Date Requested Status
Sam Spilsbury Disapprove
Daniel van Vugt Needs Information
jenkins (community) continuous-integration Needs Fixing
Review via email: mp+123740@code.qastaging.launchpad.net

Commit message

Don't build the tests of plugins if those plugins are disabled for building.

Description of the change

Don't build the tests of plugins if those plugins are disabled for building.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:3369
http://jenkins.qa.ubuntu.com/job/compiz-ci/68/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/68/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Can't we just fix this in the top-level cmake logic? A disabled plugin should not never be add_subdirectory'd.

review: Needs Information
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

-not never
+never

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

> Can't we just fix this in the top-level cmake logic? A disabled plugin should
> not never be add_subdirectory'd.

Not really, consider the following:

add_subdirectory (foo)

...

add_subdirectory (foo)

foo is the name of a plugin and is disabled. The other foo is some other library.

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I don't understand the above comment.

This generic fix works:
https://code.launchpad.net/~vanvugt/compiz/fix-1049100/+merge/123922

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Yeah, approved your fix, I was thinking of something else.

review: Disapprove

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches