Compiz

Merge lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging into lp:compiz/0.9.9

  1. compiz.DONOTMERGE.test-debugging
  2. Merge into 0.9.9
Proposed by Sam Spilsbury
Status: Rejected
Rejected by: Sam Spilsbury
Proposed branch: lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging
Merge into: lp:compiz/0.9.9
Diff against target: 440 lines (+110/-16)
13 files modified
compizconfig/gsettings/CMakeLists.txt (+0/-6)
compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt (+2/-8)
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c (+22/-0)
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.c (+3/-0)
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c (+16/-0)
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c (+5/-0)
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory_interface.c (+12/-0)
compizconfig/gsettings/src/gsettings.c (+3/-0)
compizconfig/gsettings/tests/test_gsettings_conformance.cpp (+38/-0)
compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp (+1/-1)
compizconfig/libcompizconfig/src/main.c (+6/-0)
plugins/opengl/src/window.cpp (+0/-1)
tests/shared/glib/glib_gsettings_memory_backend_env.h (+2/-0)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging
Reviewer Review Type Date Requested Status
Sam Spilsbury Needs Resubmitting
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+131300@code.launchpad.net

This proposal supersedes a proposal from 2012-10-24.

Description of the change

DO NOT MERGE

Debugging test failures in CI.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

review: Needs Fixing (continuous-integration)
lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging updated
3421. By Sam Spilsbury

fprintf

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

review: Needs Fixing (continuous-integration)
lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging updated
3422. By Sam Spilsbury

Really.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

review: Needs Fixing (continuous-integration)
lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging updated
3423. By Sam Spilsbury

Interface!?!?!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

review: Needs Fixing (continuous-integration)
lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging updated
3424. By Sam Spilsbury

Tell us a little more about the interface pointers, I doubt this will be useful

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

review: Needs Fixing (continuous-integration)
lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging updated
3425. By Sam Spilsbury

Its crashing somewhere here ...

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

review: Needs Fixing (continuous-integration)
lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging updated
3426. By Sam Spilsbury

Don't re-import lots of static libraries and static data into the gsettings backend
as this causes the tests to crash

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

review: Approve (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Awesome, build green. Marking Rejected.

review: Needs Resubmitting

Unmerged revisions

3426. By Sam Spilsbury

Don't re-import lots of static libraries and static data into the gsettings backend
as this causes the tests to crash

3425. By Sam Spilsbury

Its crashing somewhere here ...

3424. By Sam Spilsbury

Tell us a little more about the interface pointers, I doubt this will be useful

3423. By Sam Spilsbury

Interface!?!?!

3422. By Sam Spilsbury

Really.

3421. By Sam Spilsbury

fprintf

3420. By Sam Spilsbury

Another thing to try for a lack of output

3419. By Sam Spilsbury

what

3418. By Sam Spilsbury

More info...

3417. By Sam Spilsbury

How to create?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/gsettings/CMakeLists.txt'
2--- compizconfig/gsettings/CMakeLists.txt 2012-10-08 13:50:56 +0000
3+++ compizconfig/gsettings/CMakeLists.txt 2012-10-26 00:15:23 +0000
4@@ -25,12 +25,6 @@
5 ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/include)
6
7 set (COMPIZCONFIG_GSETTINGS_BACKEND_LIBRARIES
8- compizconfig_gsettings_wrapper
9- compizconfig_gnome_integration
10- compizconfig_gnome_integration_gsettings_setting_factory
11- compizconfig_gnome_integration_gsettings_wrapper_factory
12- compizconfig_gsettings_wrapper_factory_interface
13- compizconfig_gsettings_wrapper_factory
14 compizconfig_gsettings_backend)
15
16 compizconfig_backend (gsettings PKGDEPS ${_deps} LIBRARIES ${COMPIZCONFIG_GSETTINGS_BACKEND_LIBRARIES})
17
18=== modified file 'compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt'
19--- compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt 2012-10-08 13:50:56 +0000
20+++ compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt 2012-10-26 00:15:23 +0000
21@@ -58,7 +58,9 @@
22 compizconfig_gsettings_util
23 compizconfig_gsettings_wrapper
24 compizconfig_gnome_integration
25+ compizconfig_gnome_integration_gsettings_integrated_setting
26 compizconfig_gnome_integration_gsettings_setting_factory
27+ compizconfig_gnome_integration_gsettings_wrapper_factory
28 compizconfig_gsettings_wrapper_factory_interface
29 compizconfig_gsettings_wrapper_factory
30 compizconfig)
31@@ -77,12 +79,4 @@
32 install (TARGETS compizconfig_gsettings_backend
33 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
34
35- #
36- # Tell CMake that targets using compizconfig_gsettings_backend should NOT re-import the
37- # libraries that compizconfig_gsettings_backend depends on (contains).
38- #
39- set_target_properties (compizconfig_gsettings_backend PROPERTIES
40- LINK_INTERFACE_LIBRARIES ""
41- )
42-
43 endif (GSETTINGS_UTIL_FOUND)
44
45=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c'
46--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c 2012-10-09 10:56:58 +0000
47+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c 2012-10-26 00:15:23 +0000
48@@ -1,5 +1,7 @@
49+#define CCS_LOG_DOMAIN "gsettings"
50 #include <stdlib.h>
51 #include <string.h>
52+#include <stdio.h>
53
54 #include <ccs.h>
55 #include <ccs-backend.h>
56@@ -96,6 +98,8 @@
57 const char *path,
58 CCSContext *context)
59 {
60+ fprintf (stderr, "ccsGSettingsGetSettingsObjectForPluginWithPathDefault %p %s %s %p\n", backend, plugin, path, context);
61+
62 CCSGSettingsWrapper *settingsObj = NULL;
63 gchar *schemaName = getSchemaNameForPlugin (plugin);
64 GVariant *writtenPlugins;
65@@ -104,6 +108,8 @@
66
67 CCSGSettingsBackendPrivate *priv = (CCSGSettingsBackendPrivate *) ccsObjectGetPrivate (backend);
68
69+ fprintf (stderr, "findGSettingsWrapperByName\n");
70+
71 settingsObj = findCCSGSettingsWrapperBySchemaName (schemaName, priv->settingsList);
72
73 if (settingsObj)
74@@ -114,8 +120,16 @@
75
76 /* No existing settings object found for this schema, create one */
77
78+ fprintf (stderr, "create new wrapper wf %p %s\n", priv->wrapperFactory, schemaName);
79+
80 settingsObj = ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath (priv->wrapperFactory, schemaName, path, &ccsDefaultObjectAllocator);
81+
82+ fprintf (stderr, "connect to changed\n");
83+
84 ccsGSettingsBackendConnectToChangedSignal (backend, settingsObj);
85+
86+ fprintf (stderr, "append to sl\n");
87+
88 priv->settingsList = g_list_append (priv->settingsList, (void *) settingsObj);
89
90 /* Also write the plugin name to the list of modified plugins so
91@@ -124,15 +138,23 @@
92 * store keys that have changed from their defaults ... though
93 * gsettings doesn't seem to give you a way to get all of the schemas */
94
95+ fprintf (stderr, "get wp\n");
96+
97 writtenPlugins = ccsGSettingsWrapperGetValue (priv->currentProfileSettings, "plugins-with-set-keys");
98
99+ fprintf (stderr, "write rp\n");
100+
101 if (appendToPluginsWithSetKeysList (plugin, writtenPlugins, &newWrittenPlugins, &newWrittenPluginsSize))
102 {
103 GVariant *newWrittenPluginsVariant = g_variant_new_strv ((const gchar * const *) newWrittenPlugins, newWrittenPluginsSize);
104
105+ fprintf (stderr, "set rp\n");
106+
107 ccsGSettingsWrapperSetValue (priv->currentProfileSettings, "plugins-with-set-keys", newWrittenPluginsVariant);
108 }
109
110+ fprintf (stderr, "unref\n");
111+
112 g_variant_unref (writtenPlugins);
113 g_free (schemaName);
114 g_strfreev (newWrittenPlugins);
115
116=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.c'
117--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.c 2012-09-23 04:35:00 +0000
118+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.c 2012-10-26 00:15:23 +0000
119@@ -1,5 +1,6 @@
120 #include <ccs-backend.h>
121 #include "ccs_gsettings_backend_interface.h"
122+#include <stdio.h>
123
124 INTERFACE_TYPE (CCSGSettingsBackendInterface);
125
126@@ -23,6 +24,8 @@
127 const char *path,
128 CCSContext *context)
129 {
130+ fprintf (stderr, "ccsGSettingsGetSettingsObjectForPluginWithPath (iface) %p %s %s %p\n", backend, plugin, path, context);
131+
132 return (*(GET_INTERFACE (CCSGSettingsBackendInterface, backend))->gsettingsBackendGetSettingsObjectForPluginWithPath) (backend, plugin, path, context);
133 }
134
135
136=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c'
137--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c 2012-10-09 11:05:59 +0000
138+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c 2012-10-26 00:15:23 +0000
139@@ -1,4 +1,7 @@
140+#define CCS_LOG_DOMAIN "gsettings"
141+#include <stdio.h>
142 #include <gio/gio.h>
143+#include <stdio.h>
144 #include <ccs-object.h>
145 #include "ccs_gsettings_interface_wrapper.h"
146 #include "ccs_gsettings_interface.h"
147@@ -152,8 +155,12 @@
148 CCSGSettingsWrapperPrivate *priv,
149 CCSObjectAllocationInterface *ai)
150 {
151+ fprintf (stderr, "attempting to get a new GSettings object for schema %s path %s\n", schema, path);
152+
153 GSettings *settings = g_settings_new_with_path (schema, path);
154
155+ fprintf (stderr, "got GSettings object\n");
156+
157 if (!settings)
158 {
159 freeWrapperAndPriv (wrapper, priv, ai);
160@@ -217,16 +224,25 @@
161 CCSGSettingsWrapper *wrapper = NULL;
162 CCSGSettingsWrapperPrivate *priv = NULL;
163
164+ fprintf (stderr, "ccsGSettingsWrapperNewForSchemaWithPath %s %s\n", schema, path);
165+
166 if (!allocateWrapperData (ai, &wrapper, &priv))
167 return NULL;
168
169+ fprintf (stderr, "getting data...\n");
170+
171 priv->schema = g_strdup (schema);
172 priv->path = g_strdup (path);
173+
174+ fprintf (stderr, "call newGSettingsWithPath...\n");
175+
176 priv->settings = newGSettingsWithPath (schema, path, wrapper, priv, ai);
177
178 if (!priv->settings)
179 return NULL;
180
181+ fprintf (stderr, "init CCSGSettingsWrapperObject\n");
182+
183 initCCSGSettingsWrapperObject (wrapper, priv, ai);
184
185 return wrapper;
186
187=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c'
188--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c 2012-10-08 16:05:58 +0000
189+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c 2012-10-26 00:15:23 +0000
190@@ -20,6 +20,7 @@
191 * Sam Spilsbury <sam.spilsbury@canonical.com>
192 *
193 **/
194+#include <stdio.h>
195 #include <ccs-object.h>
196 #include "ccs_gsettings_wrapper_factory.h"
197 #include "ccs_gsettings_wrapper_factory_interface.h"
198@@ -56,6 +57,7 @@
199 const gchar *path,
200 CCSObjectAllocationInterface *ai)
201 {
202+ fprintf (stderr, "ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPathDefault\n");
203 CCSGSettingsWrapper *wrapper = ccsGSettingsWrapperNewForSchemaWithPath (schemaName,
204 path,
205 ai);
206@@ -87,6 +89,9 @@
207 }
208
209 ccsObjectInit (wrapperFactory, ai);
210+
211+ fprintf (stderr, "adding interrface %p newWrapper %p newGSettingsWrapper %p free %p actual: %p %p %p\n", &ccsGSettingsWrapperFactoryInterface, ccsGSettingsWrapperFactoryInterface.newGSettingsWrapper, ccsGSettingsWrapperFactoryInterface.newGSettingsWrapperWithPath, ccsGSettingsWrapperFactoryInterface.free, ccsGSettingsWrapperFactoryNewGSettingsWrapperDefault, ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPathDefault, ccsGSettingsWrapperDefaultImplFree);
212+
213 ccsObjectAddInterface (wrapperFactory, (const CCSInterface *) &ccsGSettingsWrapperFactoryInterface, GET_INTERFACE_TYPE (CCSGSettingsWrapperFactoryInterface));
214 ccsObjectSetPrivate (wrapperFactory, (CCSPrivate *) priv);
215
216
217=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory_interface.c'
218--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory_interface.c 2012-10-08 16:05:58 +0000
219+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory_interface.c 2012-10-26 00:15:23 +0000
220@@ -20,6 +20,7 @@
221 * Sam Spilsbury <sam.spilsbury@canonical.com>
222 *
223 **/
224+#include <stdio.h>
225 #include <ccs-object.h>
226 #include "ccs_gsettings_wrapper_factory_interface.h"
227
228@@ -39,6 +40,17 @@
229 const gchar *path,
230 CCSObjectAllocationInterface *ai)
231 {
232+ fprintf (stderr, "ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath %i %i\n", factory->object.n_interfaces, factory->object.refcnt);
233+
234+ unsigned int i = 0;
235+
236+ for (i = 0; i < factory->object.n_interfaces; i++)
237+ fprintf (stderr, "type: %i iface: %p\n", factory->object.interface_types[i], factory->object.interfaces[i]);
238+
239+ const CCSGSettingsWrapperFactoryInterface *interface = (const CCSGSettingsWrapperFactoryInterface *) GET_INTERFACE (CCSGSettingsWrapperFactoryInterface, factory);
240+
241+ fprintf (stderr, "check interrface %p newWrapper %p newGSettingsWrapper %p free %p\n", interface, interface->newGSettingsWrapper, interface->newGSettingsWrapperWithPath, interface->free);
242+
243 return (*(GET_INTERFACE (CCSGSettingsWrapperFactoryInterface, factory))->newGSettingsWrapperWithPath) (factory, schemaName, path, ai);
244 }
245
246
247=== modified file 'compizconfig/gsettings/src/gsettings.c'
248--- compizconfig/gsettings/src/gsettings.c 2012-10-12 01:27:50 +0000
249+++ compizconfig/gsettings/src/gsettings.c 2012-10-26 00:15:23 +0000
250@@ -44,6 +44,7 @@
251 #include "ccs_gnome_integration_gsettings_wrapper_factory.h"
252 #include "ccs_gnome_integration_gsettings_integrated_setting_factory.h"
253 #include "ccs_gnome_integration.h"
254+#include <stdio.h>
255
256 GVariant *
257 getVariantForCCSSetting (CCSBackend *backend, CCSSetting *setting)
258@@ -463,6 +464,8 @@
259 static Bool
260 initBackend (CCSBackend *backend, CCSContext * context)
261 {
262+ fprintf (stderr, "did init backend\n");
263+
264 g_type_init ();
265
266 CCSGSettingsWrapper *compizconfigSettings = ccsGSettingsWrapperNewForSchema (COMPIZCONFIG_SCHEMA_ID,
267
268=== modified file 'compizconfig/gsettings/tests/test_gsettings_conformance.cpp'
269--- compizconfig/gsettings/tests/test_gsettings_conformance.cpp 2012-10-03 10:50:07 +0000
270+++ compizconfig/gsettings/tests/test_gsettings_conformance.cpp 2012-10-26 00:15:23 +0000
271@@ -81,6 +81,8 @@
272 {
273 CCSGSettingsBackendInterface *overloadedInterface = NULL;
274
275+ std::cout << "SetUpEnv" << std::endl;
276+
277 SetUpEnv ();
278 g_setenv ("LIBCOMPIZCONFIG_BACKEND_PATH", BACKEND_BINARY_PATH, true);
279
280@@ -88,29 +90,57 @@
281
282 std::string path ("gsettings");
283
284+ std::cout << "ccsOpenBackend" << std::endl;
285+
286 mBackend = reinterpret_cast <CCSDynamicBackend *> (ccsOpenBackend (&ccsDefaultInterfaceTable, mContext, path.c_str ()));
287
288 EXPECT_TRUE (mBackend);
289
290+ std::cout << "ccsDynamicBackendGetRawBackend" << std::endl;
291+
292 mGSettingsBackend = ccsDynamicBackendGetRawBackend (mBackend);
293
294+ std::cout << "backendInit -> GetInterface" << std::endl;
295
296 CCSBackendInitFunc backendInit = (GET_INTERFACE (CCSBackendInterface, mBackend))->backendInit;
297
298+ std::cout << "backendInit ()" << std::endl;
299+
300 if (backendInit)
301 (*backendInit) ((CCSBackend *) mBackend, mContext);
302
303+ std::cout << "ccsMockIntegrationBackendNew" << std::endl;
304+
305 /* Set the new integration, drop our reference on it */
306 CCSIntegration *integration = ccsMockIntegrationBackendNew (&ccsDefaultObjectAllocator);
307 CCSIntegrationGMock *gmockIntegration = reinterpret_cast <CCSIntegrationGMock *> (ccsObjectGetPrivate (integration));
308
309 EXPECT_CALL (*gmockIntegration, getIntegratedOptionIndex (_, _)).WillRepeatedly (ReturnNull ());
310
311+ std::cout << "ccsBackendSetIntegration" << std::endl;
312+
313 ccsBackendSetIntegration ((CCSBackend *) mBackend, integration);
314 ccsIntegrationUnref (integration);
315
316+ std::cout << "overloadedInterface <- GetInterface" << std::endl;
317+
318 overloadedInterface = GET_INTERFACE (CCSGSettingsBackendInterface, mGSettingsBackend);
319 overloadedInterface->gsettingsBackendConnectToChangedSignal = CCSGSettingsBackendEnv::connectToSignalWrapper;
320+/* const gchar * const * schemas = g_settings_list_schemas ();
321+ unsigned int i = 0;
322+
323+ for (; schemas[i]; i++)
324+ std::cout << schemas[i] << std::endl;
325+
326+ schemas = g_settings_list_relocatable_schemas ();
327+ i = 0;
328+
329+ for (; schemas[i]; i++)
330+ std::cout << schemas[i] << std::endl;
331+*/
332+ std::cout << "ccsGSettingsGetSettingsObjectForPluginWithPath" << std::endl;
333+ std::cout << "just before we check the pointers .." << std::endl;
334+ std::cout << "mGSettingsBackend, mContext " << std::hex << reinterpret_cast <const void *> (mGSettingsBackend) << " " << std::hex << reinterpret_cast <const void *> (mContext) << std::dec << std::endl;
335
336 mSettings = ccsGSettingsGetSettingsObjectForPluginWithPath (mGSettingsBackend, "mock",
337 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), "mock")),
338@@ -120,6 +150,8 @@
339
340 ON_CALL (*gmockContext, getProfile ()).WillByDefault (Return (profileName.c_str ()));
341
342+ std::cout << "return <- mBackend" << std::endl;
343+
344 return (CCSBackend *) mBackend;
345 }
346
347@@ -135,6 +167,8 @@
348 g_variant_builder_add (&pluginKeysBuilder, "s", "mock");
349 GVariant *pluginKeys = g_variant_builder_end (&pluginKeysBuilder);
350
351+ std::cout << "ClearAllKeys" << std::endl;
352+
353 ccsGSettingsBackendUnsetAllChangedPluginKeysInProfile (mGSettingsBackend,
354 mContext,
355 pluginKeys,
356@@ -144,12 +178,16 @@
357 ccsGSettingsBackendSetExistingProfiles (mGSettingsBackend, noProfiles);
358 ccsGSettingsBackendSetCurrentProfile (mGSettingsBackend, "Default");
359
360+ std::cout << "FreeDynBackend" << std::endl;
361+
362 ccsFreeDynamicBackend (mBackend);
363
364 mStorage.reset ();
365
366 g_variant_unref (pluginKeys);
367
368+ std::cout << "TearDownEnv" << std::endl;
369+
370 TearDownEnv ();
371 g_unsetenv ("LIBCOMPIZCONFIG_BACKEND_PATH");
372 }
373
374=== modified file 'compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp'
375--- compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2012-10-04 09:16:07 +0000
376+++ compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2012-10-26 00:15:23 +0000
377@@ -815,7 +815,7 @@
378 {
379 };
380
381-TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, TestWriteIntegratedMediaKey)
382+TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, DISABLED_TestWriteIntegratedMediaKey)
383 {
384 const std::string settingName (GetParam ().settingName);
385 boost::shared_ptr <CCSSettingValue> compizValue (MakeAutoDestroySettingValue (TypeKey));
386
387=== modified file 'compizconfig/libcompizconfig/src/main.c'
388--- compizconfig/libcompizconfig/src/main.c 2012-09-25 08:42:49 +0000
389+++ compizconfig/libcompizconfig/src/main.c 2012-10-26 00:15:23 +0000
390@@ -176,12 +176,18 @@
391 {
392 unsigned int i = 0;
393
394+ fprintf (stderr, "ccsObjectGetInterface: searching for %i on %p\n", interface_type, object);
395+
396 for (; i < object->n_interfaces; i++)
397 {
398+ fprintf (stderr, "... cmp %i %i\n", object->interface_types[i], interface_type);
399+
400 if (object->interface_types[i] == interface_type)
401 return object->interfaces[i];
402 }
403
404+ fprintf (stderr, "... ret null\n");
405+
406 return NULL;
407 }
408
409
410=== modified file 'plugins/opengl/src/window.cpp'
411--- plugins/opengl/src/window.cpp 2012-10-16 04:49:19 +0000
412+++ plugins/opengl/src/window.cpp 2012-10-26 00:15:23 +0000
413@@ -28,7 +28,6 @@
414 #include "privates.h"
415
416 template class WrapableInterface<GLWindow, GLWindowInterface>;
417-
418 template class PluginClassHandler<GLWindow, CompWindow, COMPIZ_OPENGL_ABI>;
419
420 GLWindow::GLWindow (CompWindow *w) :
421
422=== modified file 'tests/shared/glib/glib_gsettings_memory_backend_env.h'
423--- tests/shared/glib/glib_gsettings_memory_backend_env.h 2012-09-11 14:58:20 +0000
424+++ tests/shared/glib/glib_gsettings_memory_backend_env.h 2012-10-26 00:15:23 +0000
425@@ -24,6 +24,7 @@
426 #define _COMPIZ_GLIB_GSETTINGS_MEMORY_BACKEND_TEST_ENV_H
427
428 #include <glib.h>
429+#include <iostream>
430
431 class CompizGLibGSettingsMemoryBackendTestingEnv
432 {
433@@ -31,6 +32,7 @@
434
435 virtual void SetUpEnv (const std::string &MOCK_PATH)
436 {
437+ std::cout << MOCK_PATH;
438 g_setenv ("GSETTINGS_SCHEMA_DIR", MOCK_PATH.c_str (), true);
439 g_setenv ("GSETTINGS_BACKEND", "memory", 1);
440 }

Subscribers

People subscribed via source and target branches