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: Superseded
Proposed branch: lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging
Merge into: lp:compiz/0.9.9
Diff against target: 256 lines (+62/-2)
8 files modified
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c (+9/-0)
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.c (+3/-0)
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c (+6/-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)
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
PS Jenkins bot (community) continuous-integration Needs Fixing
Compiz Maintainers Pending
Review via email: mp+131180@code.launchpad.net

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

This proposal has been superseded by a proposal from 2012-10-25.

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 :

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)
lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging updated
3419. By Sam Spilsbury

what

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

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)
lp:~compiz-team/compiz/compiz.DONOTMERGE.test-debugging updated
3420. By Sam Spilsbury

Another thing to try for a lack of output

3421. By Sam Spilsbury

fprintf

3422. By Sam Spilsbury

Really.

3423. By Sam Spilsbury

Interface!?!?!

3424. By Sam Spilsbury

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

3425. By Sam Spilsbury

Its crashing somewhere here ...

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

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/gsettings_backend_shared/ccs_gsettings_backend.c'
2--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c 2012-10-09 10:56:58 +0000
3+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c 2012-10-25 03:27:19 +0000
4@@ -1,5 +1,7 @@
5+#define CCS_LOG_DOMAIN "gsettings"
6 #include <stdlib.h>
7 #include <string.h>
8+#include <stdio.h>
9
10 #include <ccs.h>
11 #include <ccs-backend.h>
12@@ -96,6 +98,8 @@
13 const char *path,
14 CCSContext *context)
15 {
16+ printf ("ccsGSettingsGetSettingsObjectForPluginWithPathDefault %p %s %s %p\n", backend, plugin, path, context);
17+
18 CCSGSettingsWrapper *settingsObj = NULL;
19 gchar *schemaName = getSchemaNameForPlugin (plugin);
20 GVariant *writtenPlugins;
21@@ -104,6 +108,8 @@
22
23 CCSGSettingsBackendPrivate *priv = (CCSGSettingsBackendPrivate *) ccsObjectGetPrivate (backend);
24
25+ printf ("findGSettingsWrapperByName\n");
26+
27 settingsObj = findCCSGSettingsWrapperBySchemaName (schemaName, priv->settingsList);
28
29 if (settingsObj)
30@@ -114,7 +120,10 @@
31
32 /* No existing settings object found for this schema, create one */
33
34+ printf ("create new wrapper\n");
35+
36 settingsObj = ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath (priv->wrapperFactory, schemaName, path, &ccsDefaultObjectAllocator);
37+
38 ccsGSettingsBackendConnectToChangedSignal (backend, settingsObj);
39 priv->settingsList = g_list_append (priv->settingsList, (void *) settingsObj);
40
41
42=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.c'
43--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.c 2012-09-23 04:35:00 +0000
44+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.c 2012-10-25 03:27:19 +0000
45@@ -1,5 +1,6 @@
46 #include <ccs-backend.h>
47 #include "ccs_gsettings_backend_interface.h"
48+#include <stdio.h>
49
50 INTERFACE_TYPE (CCSGSettingsBackendInterface);
51
52@@ -23,6 +24,8 @@
53 const char *path,
54 CCSContext *context)
55 {
56+ fprintf (stderr, "ccsGSettingsGetSettingsObjectForPluginWithPath (iface) %p %s %s %p\n", backend, plugin, path, context);
57+
58 return (*(GET_INTERFACE (CCSGSettingsBackendInterface, backend))->gsettingsBackendGetSettingsObjectForPluginWithPath) (backend, plugin, path, context);
59 }
60
61
62=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c'
63--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c 2012-10-09 11:05:59 +0000
64+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c 2012-10-25 03:27:19 +0000
65@@ -1,4 +1,6 @@
66+#define CCS_LOG_DOMAIN "gsettings"
67 #include <gio/gio.h>
68+#include <stdio.h>
69 #include <ccs-object.h>
70 #include "ccs_gsettings_interface_wrapper.h"
71 #include "ccs_gsettings_interface.h"
72@@ -152,8 +154,12 @@
73 CCSGSettingsWrapperPrivate *priv,
74 CCSObjectAllocationInterface *ai)
75 {
76+ printf ("attempting to get a new GSettings object for schema %s path %s\n", schema, path);
77+
78 GSettings *settings = g_settings_new_with_path (schema, path);
79
80+ printf ("got GSettings object\n");
81+
82 if (!settings)
83 {
84 freeWrapperAndPriv (wrapper, priv, ai);
85
86=== modified file 'compizconfig/gsettings/src/gsettings.c'
87--- compizconfig/gsettings/src/gsettings.c 2012-10-12 01:27:50 +0000
88+++ compizconfig/gsettings/src/gsettings.c 2012-10-25 03:27:19 +0000
89@@ -44,6 +44,7 @@
90 #include "ccs_gnome_integration_gsettings_wrapper_factory.h"
91 #include "ccs_gnome_integration_gsettings_integrated_setting_factory.h"
92 #include "ccs_gnome_integration.h"
93+#include <stdio.h>
94
95 GVariant *
96 getVariantForCCSSetting (CCSBackend *backend, CCSSetting *setting)
97@@ -463,6 +464,8 @@
98 static Bool
99 initBackend (CCSBackend *backend, CCSContext * context)
100 {
101+ fprintf (stderr, "did init backend\n");
102+
103 g_type_init ();
104
105 CCSGSettingsWrapper *compizconfigSettings = ccsGSettingsWrapperNewForSchema (COMPIZCONFIG_SCHEMA_ID,
106
107=== modified file 'compizconfig/gsettings/tests/test_gsettings_conformance.cpp'
108--- compizconfig/gsettings/tests/test_gsettings_conformance.cpp 2012-10-03 10:50:07 +0000
109+++ compizconfig/gsettings/tests/test_gsettings_conformance.cpp 2012-10-25 03:27:19 +0000
110@@ -81,6 +81,8 @@
111 {
112 CCSGSettingsBackendInterface *overloadedInterface = NULL;
113
114+ std::cout << "SetUpEnv" << std::endl;
115+
116 SetUpEnv ();
117 g_setenv ("LIBCOMPIZCONFIG_BACKEND_PATH", BACKEND_BINARY_PATH, true);
118
119@@ -88,29 +90,57 @@
120
121 std::string path ("gsettings");
122
123+ std::cout << "ccsOpenBackend" << std::endl;
124+
125 mBackend = reinterpret_cast <CCSDynamicBackend *> (ccsOpenBackend (&ccsDefaultInterfaceTable, mContext, path.c_str ()));
126
127 EXPECT_TRUE (mBackend);
128
129+ std::cout << "ccsDynamicBackendGetRawBackend" << std::endl;
130+
131 mGSettingsBackend = ccsDynamicBackendGetRawBackend (mBackend);
132
133+ std::cout << "backendInit -> GetInterface" << std::endl;
134
135 CCSBackendInitFunc backendInit = (GET_INTERFACE (CCSBackendInterface, mBackend))->backendInit;
136
137+ std::cout << "backendInit ()" << std::endl;
138+
139 if (backendInit)
140 (*backendInit) ((CCSBackend *) mBackend, mContext);
141
142+ std::cout << "ccsMockIntegrationBackendNew" << std::endl;
143+
144 /* Set the new integration, drop our reference on it */
145 CCSIntegration *integration = ccsMockIntegrationBackendNew (&ccsDefaultObjectAllocator);
146 CCSIntegrationGMock *gmockIntegration = reinterpret_cast <CCSIntegrationGMock *> (ccsObjectGetPrivate (integration));
147
148 EXPECT_CALL (*gmockIntegration, getIntegratedOptionIndex (_, _)).WillRepeatedly (ReturnNull ());
149
150+ std::cout << "ccsBackendSetIntegration" << std::endl;
151+
152 ccsBackendSetIntegration ((CCSBackend *) mBackend, integration);
153 ccsIntegrationUnref (integration);
154
155+ std::cout << "overloadedInterface <- GetInterface" << std::endl;
156+
157 overloadedInterface = GET_INTERFACE (CCSGSettingsBackendInterface, mGSettingsBackend);
158 overloadedInterface->gsettingsBackendConnectToChangedSignal = CCSGSettingsBackendEnv::connectToSignalWrapper;
159+/* const gchar * const * schemas = g_settings_list_schemas ();
160+ unsigned int i = 0;
161+
162+ for (; schemas[i]; i++)
163+ std::cout << schemas[i] << std::endl;
164+
165+ schemas = g_settings_list_relocatable_schemas ();
166+ i = 0;
167+
168+ for (; schemas[i]; i++)
169+ std::cout << schemas[i] << std::endl;
170+*/
171+ std::cout << "ccsGSettingsGetSettingsObjectForPluginWithPath" << std::endl;
172+ std::cout << "just before we check the pointers .." << std::endl;
173+ std::cout << "mGSettingsBackend, mContext " << std::hex << reinterpret_cast <const void *> (mGSettingsBackend) << " " << std::hex << reinterpret_cast <const void *> (mContext) << std::dec << std::endl;
174
175 mSettings = ccsGSettingsGetSettingsObjectForPluginWithPath (mGSettingsBackend, "mock",
176 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), "mock")),
177@@ -120,6 +150,8 @@
178
179 ON_CALL (*gmockContext, getProfile ()).WillByDefault (Return (profileName.c_str ()));
180
181+ std::cout << "return <- mBackend" << std::endl;
182+
183 return (CCSBackend *) mBackend;
184 }
185
186@@ -135,6 +167,8 @@
187 g_variant_builder_add (&pluginKeysBuilder, "s", "mock");
188 GVariant *pluginKeys = g_variant_builder_end (&pluginKeysBuilder);
189
190+ std::cout << "ClearAllKeys" << std::endl;
191+
192 ccsGSettingsBackendUnsetAllChangedPluginKeysInProfile (mGSettingsBackend,
193 mContext,
194 pluginKeys,
195@@ -144,12 +178,16 @@
196 ccsGSettingsBackendSetExistingProfiles (mGSettingsBackend, noProfiles);
197 ccsGSettingsBackendSetCurrentProfile (mGSettingsBackend, "Default");
198
199+ std::cout << "FreeDynBackend" << std::endl;
200+
201 ccsFreeDynamicBackend (mBackend);
202
203 mStorage.reset ();
204
205 g_variant_unref (pluginKeys);
206
207+ std::cout << "TearDownEnv" << std::endl;
208+
209 TearDownEnv ();
210 g_unsetenv ("LIBCOMPIZCONFIG_BACKEND_PATH");
211 }
212
213=== modified file 'compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp'
214--- compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2012-10-04 09:16:07 +0000
215+++ compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2012-10-25 03:27:19 +0000
216@@ -815,7 +815,7 @@
217 {
218 };
219
220-TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, TestWriteIntegratedMediaKey)
221+TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, DISABLED_TestWriteIntegratedMediaKey)
222 {
223 const std::string settingName (GetParam ().settingName);
224 boost::shared_ptr <CCSSettingValue> compizValue (MakeAutoDestroySettingValue (TypeKey));
225
226=== modified file 'plugins/opengl/src/window.cpp'
227--- plugins/opengl/src/window.cpp 2012-10-16 04:49:19 +0000
228+++ plugins/opengl/src/window.cpp 2012-10-25 03:27:19 +0000
229@@ -28,7 +28,6 @@
230 #include "privates.h"
231
232 template class WrapableInterface<GLWindow, GLWindowInterface>;
233-
234 template class PluginClassHandler<GLWindow, CompWindow, COMPIZ_OPENGL_ABI>;
235
236 GLWindow::GLWindow (CompWindow *w) :
237
238=== modified file 'tests/shared/glib/glib_gsettings_memory_backend_env.h'
239--- tests/shared/glib/glib_gsettings_memory_backend_env.h 2012-09-11 14:58:20 +0000
240+++ tests/shared/glib/glib_gsettings_memory_backend_env.h 2012-10-25 03:27:19 +0000
241@@ -24,6 +24,7 @@
242 #define _COMPIZ_GLIB_GSETTINGS_MEMORY_BACKEND_TEST_ENV_H
243
244 #include <glib.h>
245+#include <iostream>
246
247 class CompizGLibGSettingsMemoryBackendTestingEnv
248 {
249@@ -31,6 +32,7 @@
250
251 virtual void SetUpEnv (const std::string &MOCK_PATH)
252 {
253+ std::cout << MOCK_PATH;
254 g_setenv ("GSETTINGS_SCHEMA_DIR", MOCK_PATH.c_str (), true);
255 g_setenv ("GSETTINGS_BACKEND", "memory", 1);
256 }

Subscribers

People subscribed via source and target branches