Compiz

Merge lp://qastaging/~compiz-team/compiz/libcompizconfig-test-setup into lp://qastaging/compiz/0.9.8

libcompizconfig-test-setup
Merge into 0.9.8

Proposed by Sam Spilsbury on 2012-05-21

Status:	Merged
Merged at revision:	3215
Proposed branch:	lp://qastaging/~compiz-team/compiz/libcompizconfig-test-setup
Merge into:	lp://qastaging/compiz/0.9.8
Prerequisite:	lp://qastaging/~compiz-team/compiz/build-libcompizconfig
Diff against target:	107 lines (+49/-2) 2 files modified compizconfig/libcompizconfig/src/compiz.cpp (+22/-1) compizconfig/libcompizconfig/src/main.c (+27/-1)
To merge this branch:	bzr merge lp://qastaging/~compiz-team/compiz/libcompizconfig-test-setup
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Daniel van Vugt	2012-05-21	Approve on 2012-05-22
Compiz Maintainers	2012-05-22	Pending
Review via email: mp+106659@code.qastaging.launchpad.net

Description of the change

Adds some environment variables to change where libcompizconfig looks for things to be used by tests

1. Read "COMPIZ_METADATA_PATH" to find plugins
2. Read "LIBCOMPIZCONFIG_BACKEND_PATH" to find and load backends

Revision history for this message

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

This one also fails to build the same as its siblings and parent (the prerequisite). Now fixing...

review: Needs Fixing

lp://qastaging/~compiz-team/compiz/libcompizconfig-test-setup updated on 2012-05-22

3212. By Daniel van Vugt on 2012-05-22: Fix a couple of build failures

Revision history for this message

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

Revision 3212 works for me.

Though something like this:
64 + if (asprintf (&backenddir, "%s",
65 + override_backend) == -1)
66 + backenddir = NULL;

would be more clearly written:
backenddir = strdup(override_backend);

However if you look at the surrounding code you will notice that any allocation and free of backenddir is pointless. Should just use override_backend in place.

review: Approve