Compiz Core

Merge lp://staging/~vanvugt/compiz-core/fix-994841 into lp://staging/compiz-core/0.9.8

fix-994841
Merge into 0.9.8

Proposed by Daniel van Vugt on 2012-05-08

Status:	Merged
Approved by:	Alan Griffiths on 2012-05-08
Approved revision:	3129
Merged at revision:	3130
Proposed branch:	lp://staging/~vanvugt/compiz-core/fix-994841
Merge into:	lp://staging/compiz-core/0.9.8
Diff against target:	32 lines (+10/-9) 1 file modified scripts/run-with-xvfb.sh (+10/-9)
To merge this branch:	bzr merge lp://staging/~vanvugt/compiz-core/fix-994841
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Sam Spilsbury		Approve on 2012-05-08
Alan Griffiths	2012-05-08	Approve on 2012-05-08
Review via email: mp+105020@code.staging.launchpad.net

Description of the change

If running test cases under a real X server, we don't care if Xvfb is missing
(LP: #994841)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2012-05-08:

Good

review: Approve

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-05-08:

Lgtm but we need to move that check into the cmake stage really so we ca diaable the tests rather than marking them passed (on another note - is there any reason for these to depend on X? Surelh you can mock out the xlib calls ....)

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-05-08:

I don't think most of the affected tests even need an X server at all. That's something that should be cleaned up separately.