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
=== modified file 'libgeis/backend/grail/geis_grail_backend.c'
--- libgeis/backend/grail/geis_grail_backend.c 2012-09-07 20:14:42 +0000
+++ libgeis/backend/grail/geis_grail_backend.c 2013-11-20 19:38:35 +0000
@@ -674,8 +674,10 @@
674 focus_y = (*C)[1][2] + grail_slice_get_original_center_y(slice);674 focus_y = (*C)[1][2] + grail_slice_get_original_center_y(slice);
675 }675 }
676676
677 GeisFloat bboxMinX, bboxMinY = FLT_MAX;677 GeisFloat bboxMinX = FLT_MAX;
678 GeisFloat bboxMaxX, bboxMaxY = 0.0f;678 GeisFloat bboxMinY = FLT_MAX;
679 GeisFloat bboxMaxX = 0.0f;
680 GeisFloat bboxMaxY = 0.0f;
679 for (GeisInteger t = 0; t < num_touches; ++t)681 for (GeisInteger t = 0; t < num_touches; ++t)
680 {682 {
681 GeisTouch touch = geis_touch_new(t);683 GeisTouch touch = geis_touch_new(t);
@@ -707,7 +709,7 @@
707 focus_y = frame_touch_get_window_y(uftouch);709 focus_y = frame_touch_get_window_y(uftouch);
708 }710 }
709711
710 GeisFloat touch_x, touch_y;712 GeisFloat touch_x = 0.0f, touch_y = 0.0f;
711 if (is_touchscreen)713 if (is_touchscreen)
712 {714 {
713 touch_x = frame_touch_get_window_x(uftouch);715 touch_x = frame_touch_get_window_x(uftouch);
714716
=== modified file 'libs/geis-util/geis_bag.c'
--- libs/geis-util/geis_bag.c 2011-12-21 17:35:47 +0000
+++ libs/geis-util/geis_bag.c 2013-11-20 19:38:35 +0000
@@ -162,7 +162,7 @@
162 {162 {
163 char *dst = (char *)bag->data_store + bag->datum_size * index;163 char *dst = (char *)bag->data_store + bag->datum_size * index;
164 char *src = dst + bag->datum_size;164 char *src = dst + bag->datum_size;
165 memcpy(dst, src, size);165 memmove(dst, src, size);
166 }166 }
167 --bag->data_count;167 --bag->data_count;
168 status = GEIS_STATUS_SUCCESS;168 status = GEIS_STATUS_SUCCESS;
169169
=== modified file 'testsuite/geis-util/Makefile.am'
--- testsuite/geis-util/Makefile.am 2012-06-21 21:17:25 +0000
+++ testsuite/geis-util/Makefile.am 2013-11-20 19:38:35 +0000
@@ -39,7 +39,7 @@
39check_geis_util_LDADD = \39check_geis_util_LDADD = \
40 $(top_builddir)/libs/geis-util/libgeis-util.la \40 $(top_builddir)/libs/geis-util/libgeis-util.la \
41 $(CHECK_LIBS) \41 $(CHECK_LIBS) \
42 -lm42 -lm -lpthread
4343
44MOSTLYCLEANFILES = \44MOSTLYCLEANFILES = \
45 geis_util.log \45 geis_util.log \
4646
=== modified file 'testsuite/geis1/Makefile.am'
--- testsuite/geis1/Makefile.am 2012-06-21 21:17:25 +0000
+++ testsuite/geis1/Makefile.am 2013-11-20 19:38:35 +0000
@@ -50,7 +50,7 @@
50 -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\" \50 -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\" \
51 $(GTEST_CFLAGS) \51 $(GTEST_CFLAGS) \
52 $(EVEMU_CFLAGS) \52 $(EVEMU_CFLAGS) \
53 $(XORG_GTEST_CFLAGS)53 $(XORG_GTEST_CPPFLAGS)
5454
55gtest_geis1_api_LDADD = \55gtest_geis1_api_LDADD = \
56 $(top_builddir)/testsuite/gtest/libgtest_geis.a \56 $(top_builddir)/testsuite/gtest/libgtest_geis.a \
5757
=== modified file 'testsuite/geis2/Makefile.am'
--- testsuite/geis2/Makefile.am 2012-12-07 18:40:40 +0000
+++ testsuite/geis2/Makefile.am 2013-11-20 19:38:35 +0000
@@ -36,7 +36,8 @@
3636
37check_geis2_api_LDADD = \37check_geis2_api_LDADD = \
38 $(top_builddir)/libgeis/libgeis.la \38 $(top_builddir)/libgeis/libgeis.la \
39 $(CHECK_LIBS)39 $(CHECK_LIBS) \
40 -lpthread
4041
41#### gtest_geis2_grail_backend - Test for the GRAIL backend of Geis v2 API #####42#### gtest_geis2_grail_backend - Test for the GRAIL backend of Geis v2 API #####
42#### using gtest #####43#### using gtest #####
@@ -62,7 +63,7 @@
62 -I$(top_srcdir)/libgeis \63 -I$(top_srcdir)/libgeis \
63 -I$(top_srcdir)/testsuite/gtest \64 -I$(top_srcdir)/testsuite/gtest \
64 -I$(top_srcdir)/testsuite/x11_mocks \65 -I$(top_srcdir)/testsuite/x11_mocks \
65 -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\"66 -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\" \
66 $(GTEST_CFLAGS)67 $(GTEST_CFLAGS)
6768
68gtest_geis2_grail_backend_LDFLAGS = \69gtest_geis2_grail_backend_LDFLAGS = \
@@ -95,10 +96,10 @@
95 -I$(top_srcdir)/include \96 -I$(top_srcdir)/include \
96 -I$(top_srcdir)/libgeis \97 -I$(top_srcdir)/libgeis \
97 -I$(top_srcdir)/testsuite/gtest \98 -I$(top_srcdir)/testsuite/gtest \
98 -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\"99 -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\" \
99 $(GTEST_CFLAGS) \100 $(GTEST_CFLAGS) \
100 $(EVEMU_CFLAGS) \101 $(EVEMU_CFLAGS) \
101 $(XORG_GTEST_CFLAGS)102 $(XORG_GTEST_CPPFLAGS)
102103
103gtest_geis2_api_LDADD = \104gtest_geis2_api_LDADD = \
104 $(top_builddir)/testsuite/gtest/libgtest_geis.a \105 $(top_builddir)/testsuite/gtest/libgtest_geis.a \
105106
=== modified file 'testsuite/geis2/gtest_attrs.cpp'
--- testsuite/geis2/gtest_attrs.cpp 2012-04-24 18:42:43 +0000
+++ testsuite/geis2/gtest_attrs.cpp 2013-11-20 19:38:35 +0000
@@ -52,8 +52,6 @@
5252
53 ~TestSubscription()53 ~TestSubscription()
54 {54 {
55 geis_filter_delete(filter_);
56 geis_subscription_delete(subscription_);
57 }55 }
5856
59private:57private:
6058
=== modified file 'testsuite/geis2/gtest_config.cpp'
--- testsuite/geis2/gtest_config.cpp 2012-04-24 15:48:46 +0000
+++ testsuite/geis2/gtest_config.cpp 2013-11-20 19:38:35 +0000
@@ -78,7 +78,6 @@
78void Geis2ConfigTests::78void Geis2ConfigTests::
79TearDown()79TearDown()
80{80{
81 geis_filter_delete(filter_);
82 geis_subscription_delete(subscription_);81 geis_subscription_delete(subscription_);
83 GTestGeisFixture::TearDown();82 GTestGeisFixture::TearDown();
84}83}
8584
=== modified file 'testsuite/geis2/gtest_devices.cpp'
--- testsuite/geis2/gtest_devices.cpp 2012-06-21 21:17:25 +0000
+++ testsuite/geis2/gtest_devices.cpp 2013-11-20 19:38:35 +0000
@@ -123,7 +123,6 @@
123 geis_dispatch_loop();123 geis_dispatch_loop();
124 EXPECT_TRUE(gesture_events_received) << "no gesture events received";124 EXPECT_TRUE(gesture_events_received) << "no gesture events received";
125 EXPECT_TRUE(device_has_been_created) << "no device created";125 EXPECT_TRUE(device_has_been_created) << "no device created";
126 geis_filter_delete(filter);
127 geis_subscription_delete(sub);126 geis_subscription_delete(sub);
128}127}
129128
@@ -174,7 +173,6 @@
174 });173 });
175174
176 geis_dispatch_loop();175 geis_dispatch_loop();
177 geis_filter_delete(filter);
178 geis_subscription_delete(sub);176 geis_subscription_delete(sub);
179}177}
180178
181179
=== modified file 'testsuite/geis2/gtest_subscriptions.cpp'
--- testsuite/geis2/gtest_subscriptions.cpp 2012-04-27 16:53:10 +0000
+++ testsuite/geis2/gtest_subscriptions.cpp 2013-11-20 19:38:35 +0000
@@ -183,9 +183,7 @@
183 });183 });
184184
185 geis_dispatch_loop();185 geis_dispatch_loop();
186 geis_filter_delete(filter2);
187 geis_subscription_delete(sub2);186 geis_subscription_delete(sub2);
188 geis_filter_delete(filter1);
189 geis_subscription_delete(sub1);187 geis_subscription_delete(sub1);
190 geis_delete(geis2);188 geis_delete(geis2);
191}189}
@@ -211,7 +209,6 @@
211 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not add class to filter";209 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not add class to filter";
212 fs = geis_subscription_add_filter(sub, filter);210 fs = geis_subscription_add_filter(sub, filter);
213 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not subscribe filter";211 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not subscribe filter";
214 geis_filter_delete(filter);
215 EXPECT_EQ(GEIS_STATUS_SUCCESS, geis_subscription_activate(sub))212 EXPECT_EQ(GEIS_STATUS_SUCCESS, geis_subscription_activate(sub))
216 << "can not activate subscription";213 << "can not activate subscription";
217214
@@ -298,7 +295,6 @@
298 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not add class to filter";295 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not add class to filter";
299 fs = geis_subscription_add_filter(sub, filter);296 fs = geis_subscription_add_filter(sub, filter);
300 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not subscribe filter";297 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not subscribe filter";
301 geis_filter_delete(filter);
302 EXPECT_EQ(GEIS_STATUS_SUCCESS, geis_subscription_activate(sub))298 EXPECT_EQ(GEIS_STATUS_SUCCESS, geis_subscription_activate(sub))
303 << "can not activate subscription";299 << "can not activate subscription";
304300
@@ -380,7 +376,6 @@
380 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not add class to filter";376 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not add class to filter";
381 fs = geis_subscription_add_filter(sub, filter);377 fs = geis_subscription_add_filter(sub, filter);
382 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not subscribe filter";378 EXPECT_EQ(fs, GEIS_STATUS_SUCCESS) << "can not subscribe filter";
383 geis_filter_delete(filter);
384379
385 EXPECT_EQ(GEIS_STATUS_SUCCESS, geis_subscription_activate(sub))380 EXPECT_EQ(GEIS_STATUS_SUCCESS, geis_subscription_activate(sub))
386 << "can not activate subscription";381 << "can not activate subscription";
387382
=== modified file 'testsuite/gtest/Makefile.am'
--- testsuite/gtest/Makefile.am 2012-06-21 21:17:25 +0000
+++ testsuite/gtest/Makefile.am 2013-11-20 19:38:35 +0000
@@ -8,7 +8,7 @@
8endif8endif
99
10nodist_libgtest_geis_a_SOURCES = \10nodist_libgtest_geis_a_SOURCES = \
11 $(GTEST_SOURCE)/src/gtest-all.cc11 $(GTEST_SOURCE)/gtest-all.cc
1212
13libgtest_geis_a_CPPFLAGS = \13libgtest_geis_a_CPPFLAGS = \
14 -I$(top_srcdir) \14 -I$(top_srcdir) \
1515
=== modified file 'testsuite/libgeis/Makefile.am'
--- testsuite/libgeis/Makefile.am 2012-07-24 16:04:12 +0000
+++ testsuite/libgeis/Makefile.am 2013-11-20 19:38:35 +0000
@@ -77,7 +77,7 @@
77 $(XCB_LIBS) \77 $(XCB_LIBS) \
78 $(XI2_LIBS) \78 $(XI2_LIBS) \
79 $(CHECK_LIBS) \79 $(CHECK_LIBS) \
80 -lm -ldl80 -lm -ldl -lpthread
8181
82MOSTLYCLEANFILES = \82MOSTLYCLEANFILES = \
83 geis2_internals.log \83 geis2_internals.log \

Subscribers

People subscribed via source and target branches