Geis

Merge lp:~bregma/geis/update-gtest into lp:geis

  1. update-gtest
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 330
Merged at revision: 324
Proposed branch: lp:~bregma/geis/update-gtest
Merge into: lp:geis
Diff against target: 209 lines (+15/-22)
11 files modified
libgeis/backend/grail/geis_grail_backend.c (+5/-3)
libs/geis-util/geis_bag.c (+1/-1)
testsuite/geis-util/Makefile.am (+1/-1)
testsuite/geis1/Makefile.am (+1/-1)
testsuite/geis2/Makefile.am (+5/-4)
testsuite/geis2/gtest_attrs.cpp (+0/-2)
testsuite/geis2/gtest_config.cpp (+0/-1)
testsuite/geis2/gtest_devices.cpp (+0/-2)
testsuite/geis2/gtest_subscriptions.cpp (+0/-5)
testsuite/gtest/Makefile.am (+1/-1)
testsuite/libgeis/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~bregma/geis/update-gtest
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+195976@code.launchpad.net

Commit message

fixed errors in "make check"

Description of the change

Refreshed paths and configurations for "make check" target runs successfully on Ubuntu 13.10.

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

PASSED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/geis-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-trusty-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-trusty-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/geis-ci/11/rebuild

review: Approve (continuous-integration)
lp:~bregma/geis/update-gtest updated
330. By Stephen M. Webb

fixed additional double-deletes caused by filter ownership transfer

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

PASSED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/geis-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-trusty-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-trusty-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/geis-ci/12/rebuild

review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgeis/backend/grail/geis_grail_backend.c'
2--- libgeis/backend/grail/geis_grail_backend.c 2012-09-07 20:14:42 +0000
3+++ libgeis/backend/grail/geis_grail_backend.c 2013-11-20 19:38:35 +0000
4@@ -674,8 +674,10 @@
5 focus_y = (*C)[1][2] + grail_slice_get_original_center_y(slice);
6 }
7
8- GeisFloat bboxMinX, bboxMinY = FLT_MAX;
9- GeisFloat bboxMaxX, bboxMaxY = 0.0f;
10+ GeisFloat bboxMinX = FLT_MAX;
11+ GeisFloat bboxMinY = FLT_MAX;
12+ GeisFloat bboxMaxX = 0.0f;
13+ GeisFloat bboxMaxY = 0.0f;
14 for (GeisInteger t = 0; t < num_touches; ++t)
15 {
16 GeisTouch touch = geis_touch_new(t);
17@@ -707,7 +709,7 @@
18 focus_y = frame_touch_get_window_y(uftouch);
19 }
20
21- GeisFloat touch_x, touch_y;
22+ GeisFloat touch_x = 0.0f, touch_y = 0.0f;
23 if (is_touchscreen)
24 {
25 touch_x = frame_touch_get_window_x(uftouch);
26
27=== modified file 'libs/geis-util/geis_bag.c'
28--- libs/geis-util/geis_bag.c 2011-12-21 17:35:47 +0000
29+++ libs/geis-util/geis_bag.c 2013-11-20 19:38:35 +0000
30@@ -162,7 +162,7 @@
31 {
32 char *dst = (char *)bag->data_store + bag->datum_size * index;
33 char *src = dst + bag->datum_size;
34- memcpy(dst, src, size);
35+ memmove(dst, src, size);
36 }
37 --bag->data_count;
38 status = GEIS_STATUS_SUCCESS;
39
40=== modified file 'testsuite/geis-util/Makefile.am'
41--- testsuite/geis-util/Makefile.am 2012-06-21 21:17:25 +0000
42+++ testsuite/geis-util/Makefile.am 2013-11-20 19:38:35 +0000
43@@ -39,7 +39,7 @@
44 check_geis_util_LDADD = \
45 $(top_builddir)/libs/geis-util/libgeis-util.la \
46 $(CHECK_LIBS) \
47- -lm
48+ -lm -lpthread
49
50 MOSTLYCLEANFILES = \
51 geis_util.log \
52
53=== modified file 'testsuite/geis1/Makefile.am'
54--- testsuite/geis1/Makefile.am 2012-06-21 21:17:25 +0000
55+++ testsuite/geis1/Makefile.am 2013-11-20 19:38:35 +0000
56@@ -50,7 +50,7 @@
57 -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\" \
58 $(GTEST_CFLAGS) \
59 $(EVEMU_CFLAGS) \
60- $(XORG_GTEST_CFLAGS)
61+ $(XORG_GTEST_CPPFLAGS)
62
63 gtest_geis1_api_LDADD = \
64 $(top_builddir)/testsuite/gtest/libgtest_geis.a \
65
66=== modified file 'testsuite/geis2/Makefile.am'
67--- testsuite/geis2/Makefile.am 2012-12-07 18:40:40 +0000
68+++ testsuite/geis2/Makefile.am 2013-11-20 19:38:35 +0000
69@@ -36,7 +36,8 @@
70
71 check_geis2_api_LDADD = \
72 $(top_builddir)/libgeis/libgeis.la \
73- $(CHECK_LIBS)
74+ $(CHECK_LIBS) \
75+ -lpthread
76
77 #### gtest_geis2_grail_backend - Test for the GRAIL backend of Geis v2 API #####
78 #### using gtest #####
79@@ -62,7 +63,7 @@
80 -I$(top_srcdir)/libgeis \
81 -I$(top_srcdir)/testsuite/gtest \
82 -I$(top_srcdir)/testsuite/x11_mocks \
83- -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\"
84+ -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\" \
85 $(GTEST_CFLAGS)
86
87 gtest_geis2_grail_backend_LDFLAGS = \
88@@ -95,10 +96,10 @@
89 -I$(top_srcdir)/include \
90 -I$(top_srcdir)/libgeis \
91 -I$(top_srcdir)/testsuite/gtest \
92- -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\"
93+ -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\" \
94 $(GTEST_CFLAGS) \
95 $(EVEMU_CFLAGS) \
96- $(XORG_GTEST_CFLAGS)
97+ $(XORG_GTEST_CPPFLAGS)
98
99 gtest_geis2_api_LDADD = \
100 $(top_builddir)/testsuite/gtest/libgtest_geis.a \
101
102=== modified file 'testsuite/geis2/gtest_attrs.cpp'
103--- testsuite/geis2/gtest_attrs.cpp 2012-04-24 18:42:43 +0000
104+++ testsuite/geis2/gtest_attrs.cpp 2013-11-20 19:38:35 +0000
105@@ -52,8 +52,6 @@
106
107 ~TestSubscription()
108 {
109- geis_filter_delete(filter_);
110- geis_subscription_delete(subscription_);
111 }
112
113 private:
114
115=== modified file 'testsuite/geis2/gtest_config.cpp'
116--- testsuite/geis2/gtest_config.cpp 2012-04-24 15:48:46 +0000
117+++ testsuite/geis2/gtest_config.cpp 2013-11-20 19:38:35 +0000
118@@ -78,7 +78,6 @@
119 void Geis2ConfigTests::
120 TearDown()
121 {
122- geis_filter_delete(filter_);
123 geis_subscription_delete(subscription_);
124 GTestGeisFixture::TearDown();
125 }
126
127=== modified file 'testsuite/geis2/gtest_devices.cpp'
128--- testsuite/geis2/gtest_devices.cpp 2012-06-21 21:17:25 +0000
129+++ testsuite/geis2/gtest_devices.cpp 2013-11-20 19:38:35 +0000
130@@ -123,7 +123,6 @@
131 geis_dispatch_loop();
132 EXPECT_TRUE(gesture_events_received) << "no gesture events received";
133 EXPECT_TRUE(device_has_been_created) << "no device created";
134- geis_filter_delete(filter);
135 geis_subscription_delete(sub);
136 }
137
138@@ -174,7 +173,6 @@
139 });
140
141 geis_dispatch_loop();
142- geis_filter_delete(filter);
143 geis_subscription_delete(sub);
144 }
145
146
147=== modified file 'testsuite/geis2/gtest_subscriptions.cpp'
148--- testsuite/geis2/gtest_subscriptions.cpp 2012-04-27 16:53:10 +0000
149+++ testsuite/geis2/gtest_subscriptions.cpp 2013-11-20 19:38:35 +0000
150@@ -183,9 +183,7 @@
151 });
152
153 geis_dispatch_loop();
154- geis_filter_delete(filter2);
155 geis_subscription_delete(sub2);
156- geis_filter_delete(filter1);
157 geis_subscription_delete(sub1);
158 geis_delete(geis2);
159 }
160@@ -211,7 +209,6 @@
161 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not add class to filter";
162 fs = geis_subscription_add_filter(sub, filter);
163 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not subscribe filter";
164- geis_filter_delete(filter);
165 EXPECT_EQ(GEIS_STATUS_SUCCESS, geis_subscription_activate(sub))
166 << "can not activate subscription";
167
168@@ -298,7 +295,6 @@
169 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not add class to filter";
170 fs = geis_subscription_add_filter(sub, filter);
171 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not subscribe filter";
172- geis_filter_delete(filter);
173 EXPECT_EQ(GEIS_STATUS_SUCCESS, geis_subscription_activate(sub))
174 << "can not activate subscription";
175
176@@ -380,7 +376,6 @@
177 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not add class to filter";
178 fs = geis_subscription_add_filter(sub, filter);
179 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not subscribe filter";
180- geis_filter_delete(filter);
181
182 EXPECT_EQ(GEIS_STATUS_SUCCESS, geis_subscription_activate(sub))
183 << "can not activate subscription";
184
185=== modified file 'testsuite/gtest/Makefile.am'
186--- testsuite/gtest/Makefile.am 2012-06-21 21:17:25 +0000
187+++ testsuite/gtest/Makefile.am 2013-11-20 19:38:35 +0000
188@@ -8,7 +8,7 @@
189 endif
190
191 nodist_libgtest_geis_a_SOURCES = \
192- $(GTEST_SOURCE)/src/gtest-all.cc
193+ $(GTEST_SOURCE)/gtest-all.cc
194
195 libgtest_geis_a_CPPFLAGS = \
196 -I$(top_srcdir) \
197
198=== modified file 'testsuite/libgeis/Makefile.am'
199--- testsuite/libgeis/Makefile.am 2012-07-24 16:04:12 +0000
200+++ testsuite/libgeis/Makefile.am 2013-11-20 19:38:35 +0000
201@@ -77,7 +77,7 @@
202 $(XCB_LIBS) \
203 $(XI2_LIBS) \
204 $(CHECK_LIBS) \
205- -lm -ldl
206+ -lm -ldl -lpthread
207
208 MOSTLYCLEANFILES = \
209 geis2_internals.log \

Subscribers

People subscribed via source and target branches