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: 164 lines (+31/-2)
6 files modified
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c (+2/-0)
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c (+1/-0)
compizconfig/gsettings/tests/test_gsettings_conformance.cpp (+25/-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+130758@code.launchpad.net

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

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 :

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

Merge lp:compiz

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

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

More interesting info

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

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

Useful

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

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

List schemas

3416. By Sam Spilsbury

Mor einfo?

3417. By Sam Spilsbury

How to create?

3418. By Sam Spilsbury

More info...

3419. By Sam Spilsbury

what

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-23 01:54:21 +0000
4@@ -1,3 +1,4 @@
5+#define CCS_LOG_DOMAIN "gsettings"
6 #include <stdlib.h>
7 #include <string.h>
8
9@@ -115,6 +116,7 @@
10 /* No existing settings object found for this schema, create one */
11
12 settingsObj = ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath (priv->wrapperFactory, schemaName, path, &ccsDefaultObjectAllocator);
13+
14 ccsGSettingsBackendConnectToChangedSignal (backend, settingsObj);
15 priv->settingsList = g_list_append (priv->settingsList, (void *) settingsObj);
16
17
18=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c'
19--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c 2012-10-09 11:05:59 +0000
20+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c 2012-10-23 01:54:21 +0000
21@@ -1,3 +1,4 @@
22+#define CCS_LOG_DOMAIN "gsettings"
23 #include <gio/gio.h>
24 #include <ccs-object.h>
25 #include "ccs_gsettings_interface_wrapper.h"
26
27=== modified file 'compizconfig/gsettings/tests/test_gsettings_conformance.cpp'
28--- compizconfig/gsettings/tests/test_gsettings_conformance.cpp 2012-10-03 10:50:07 +0000
29+++ compizconfig/gsettings/tests/test_gsettings_conformance.cpp 2012-10-23 01:54:21 +0000
30@@ -81,6 +81,8 @@
31 {
32 CCSGSettingsBackendInterface *overloadedInterface = NULL;
33
34+ std::cout << "SetUpEnv" << std::endl;
35+
36 SetUpEnv ();
37 g_setenv ("LIBCOMPIZCONFIG_BACKEND_PATH", BACKEND_BINARY_PATH, true);
38
39@@ -88,30 +90,45 @@
40
41 std::string path ("gsettings");
42
43+ std::cout << "ccsOpenBackend" << std::endl;
44+
45 mBackend = reinterpret_cast <CCSDynamicBackend *> (ccsOpenBackend (&ccsDefaultInterfaceTable, mContext, path.c_str ()));
46
47 EXPECT_TRUE (mBackend);
48
49+ std::cout << "ccsDynamicBackendGetRawBackend" << std::endl;
50+
51 mGSettingsBackend = ccsDynamicBackendGetRawBackend (mBackend);
52
53+ std::cout << "backendInit -> GetInterface" << std::endl;
54
55 CCSBackendInitFunc backendInit = (GET_INTERFACE (CCSBackendInterface, mBackend))->backendInit;
56
57+ std::cout << "backendInit ()" << std::endl;
58+
59 if (backendInit)
60 (*backendInit) ((CCSBackend *) mBackend, mContext);
61
62+ std::cout << "ccsMockIntegrationBackendNew" << std::endl;
63+
64 /* Set the new integration, drop our reference on it */
65 CCSIntegration *integration = ccsMockIntegrationBackendNew (&ccsDefaultObjectAllocator);
66 CCSIntegrationGMock *gmockIntegration = reinterpret_cast <CCSIntegrationGMock *> (ccsObjectGetPrivate (integration));
67
68 EXPECT_CALL (*gmockIntegration, getIntegratedOptionIndex (_, _)).WillRepeatedly (ReturnNull ());
69
70+ std::cout << "ccsBackendSetIntegration" << std::endl;
71+
72 ccsBackendSetIntegration ((CCSBackend *) mBackend, integration);
73 ccsIntegrationUnref (integration);
74
75+ std::cout << "overloadedInterface <- GetInterface" << std::endl;
76+
77 overloadedInterface = GET_INTERFACE (CCSGSettingsBackendInterface, mGSettingsBackend);
78 overloadedInterface->gsettingsBackendConnectToChangedSignal = CCSGSettingsBackendEnv::connectToSignalWrapper;
79
80+ std::cout << "ccsGSettingsGetSettingsObjectForPluginWithPath" << std::endl;
81+
82 mSettings = ccsGSettingsGetSettingsObjectForPluginWithPath (mGSettingsBackend, "mock",
83 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), "mock")),
84 mContext);
85@@ -120,6 +137,8 @@
86
87 ON_CALL (*gmockContext, getProfile ()).WillByDefault (Return (profileName.c_str ()));
88
89+ std::cout << "return <- mBackend" << std::endl;
90+
91 return (CCSBackend *) mBackend;
92 }
93
94@@ -135,6 +154,8 @@
95 g_variant_builder_add (&pluginKeysBuilder, "s", "mock");
96 GVariant *pluginKeys = g_variant_builder_end (&pluginKeysBuilder);
97
98+ std::cout << "ClearAllKeys" << std::endl;
99+
100 ccsGSettingsBackendUnsetAllChangedPluginKeysInProfile (mGSettingsBackend,
101 mContext,
102 pluginKeys,
103@@ -144,12 +165,16 @@
104 ccsGSettingsBackendSetExistingProfiles (mGSettingsBackend, noProfiles);
105 ccsGSettingsBackendSetCurrentProfile (mGSettingsBackend, "Default");
106
107+ std::cout << "FreeDynBackend" << std::endl;
108+
109 ccsFreeDynamicBackend (mBackend);
110
111 mStorage.reset ();
112
113 g_variant_unref (pluginKeys);
114
115+ std::cout << "TearDownEnv" << std::endl;
116+
117 TearDownEnv ();
118 g_unsetenv ("LIBCOMPIZCONFIG_BACKEND_PATH");
119 }
120
121=== modified file 'compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp'
122--- compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2012-10-04 09:16:07 +0000
123+++ compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2012-10-23 01:54:21 +0000
124@@ -815,7 +815,7 @@
125 {
126 };
127
128-TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, TestWriteIntegratedMediaKey)
129+TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, DISABLED_TestWriteIntegratedMediaKey)
130 {
131 const std::string settingName (GetParam ().settingName);
132 boost::shared_ptr <CCSSettingValue> compizValue (MakeAutoDestroySettingValue (TypeKey));
133
134=== modified file 'plugins/opengl/src/window.cpp'
135--- plugins/opengl/src/window.cpp 2012-10-16 04:49:19 +0000
136+++ plugins/opengl/src/window.cpp 2012-10-23 01:54:21 +0000
137@@ -28,7 +28,6 @@
138 #include "privates.h"
139
140 template class WrapableInterface<GLWindow, GLWindowInterface>;
141-
142 template class PluginClassHandler<GLWindow, CompWindow, COMPIZ_OPENGL_ABI>;
143
144 GLWindow::GLWindow (CompWindow *w) :
145
146=== modified file 'tests/shared/glib/glib_gsettings_memory_backend_env.h'
147--- tests/shared/glib/glib_gsettings_memory_backend_env.h 2012-09-11 14:58:20 +0000
148+++ tests/shared/glib/glib_gsettings_memory_backend_env.h 2012-10-23 01:54:21 +0000
149@@ -24,6 +24,7 @@
150 #define _COMPIZ_GLIB_GSETTINGS_MEMORY_BACKEND_TEST_ENV_H
151
152 #include <glib.h>
153+#include <iostream>
154
155 class CompizGLibGSettingsMemoryBackendTestingEnv
156 {
157@@ -31,6 +32,7 @@
158
159 virtual void SetUpEnv (const std::string &MOCK_PATH)
160 {
161+ std::cout << MOCK_PATH;
162 g_setenv ("GSETTINGS_SCHEMA_DIR", MOCK_PATH.c_str (), true);
163 g_setenv ("GSETTINGS_BACKEND", "memory", 1);
164 }

Subscribers

People subscribed via source and target branches