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

[Sam Spilsbury]

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

[Daniel van Vugt (vanvugt)]

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

review: Needs Fixing

[lp:~compiz-team/compiz/libcompizconfig-test-setup]

3212. By Daniel van Vugt on 2012-05-22

Fix a couple of build failures

[Daniel van Vugt (vanvugt)]

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

=== modified file 'compizconfig/libcompizconfig/src/compiz.cpp'
--- compizconfig/libcompizconfig/src/compiz.cpp	2012-05-22 07:41:20 +0000
+++ compizconfig/libcompizconfig/src/compiz.cpp	2012-05-22 07:41:20 +0000
@@ -37,6 +37,7 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <errno.h>
+#include <glib.h>
 
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
@@ -2845,7 +2846,9 @@
 
     // Load from .xml
     FILE *fp = fopen (xmlFilePath, "r");
+#ifdef USE_PROTOBUF
     Bool xmlLoaded = FALSE;
+#endif
 
     if (fp)
     {
@@ -2853,7 +2856,10 @@
 	xmlDoc *doc = xmlReadFile (xmlFilePath, NULL, 0);
 	if (doc)
 	{
-	    xmlLoaded = loadPluginFromXML (context, doc, xmlFilePath,
+#ifdef USE_PROTOBUF
+	    xmlLoaded =
+#endif
+	    loadPluginFromXML (context, doc, xmlFilePath,
 					   pluginInfoPBv);
 	    xmlFreeDoc (doc);
 	}
@@ -3035,6 +3041,21 @@
 #endif
 
     char *home = getenv ("HOME");
+    char *overload_metadata = getenv ("COMPIZ_METADATA_PATH");
+
+    if (overload_metadata && strlen (overload_metadata))
+    {
+	char *overloadmetaplugins = NULL;
+	if (asprintf (&overloadmetaplugins, "%s", overload_metadata) == -1)
+	    overloadmetaplugins = NULL;
+
+	if (overloadmetaplugins)
+	{
+	    loadPluginsFromXMLFiles (context, overloadmetaplugins);
+	    free (overloadmetaplugins);
+	}
+    }
+
     if (home && strlen (home))
     {
 	char *homeplugins = NULL;
 
=== modified file 'compizconfig/libcompizconfig/src/main.c'
--- compizconfig/libcompizconfig/src/main.c	2012-05-22 07:41:20 +0000
+++ compizconfig/libcompizconfig/src/main.c	2012-05-22 07:41:20 +0000
@@ -596,11 +596,23 @@
 openBackend (char *backend)
 {
     char *home = getenv ("HOME");
+    char *override_backend = getenv ("LIBCOMPIZCONFIG_BACKEND_PATH");
     void *dlhand = NULL;
     char *dlname = NULL;
     char *err = NULL;
 
-    if (home && strlen (home))
+    if (override_backend && strlen (override_backend))
+    {
+	if (asprintf (&dlname, "%s/lib%s.so",
+		      override_backend, backend) == -1)
+	    dlname = NULL;
+
+	dlerror ();
+	dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
+	err = dlerror ();
+    }
+
+    if (!dlhand && home && strlen (home))
     {
 	if (asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so",
 		      home, backend) == -1)
@@ -2695,8 +2707,22 @@
 {
     CCSBackendInfoList rv = NULL;
     char *home = getenv ("HOME");
+    char *override_backend = getenv ("LIBCOMPIZCONFIG_BACKEND_PATH");
     char *backenddir;
 
+    if (override_backend && strlen (override_backend))
+    {
+	if (asprintf (&backenddir, "%s",
+		      override_backend) == -1)
+	    backenddir = NULL;
+
+	if (backenddir)
+	{
+	    getBackendInfoFromDir (&rv, backenddir);
+	    free (backenddir);
+	}
+    }
+
     if (home && strlen (home))
     {
 	if (asprintf (&backenddir, "%s/.compizconfig/backends", home) == -1)