Geis

Merge lp:~bregma/geis/fix-x11-mocks-ftbfs-in-ppa into lp:geis

  1. fix-x11-mocks-ftbfs-in-ppa
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Merged at revision: 259
Proposed branch: lp:~bregma/geis/fix-x11-mocks-ftbfs-in-ppa
Merge into: lp:geis
Diff against target: 88 lines (+16/-8)
5 files modified
m4/gtest.m4 (+5/-3)
testsuite/geis2/Makefile.am (+5/-1)
testsuite/x11_mocks/Makefile.am (+3/-2)
testsuite/x11_mocks/x11_mocks.c (+2/-2)
testsuite/x11_mocks/x11_mocks.h (+1/-0)
To merge this branch: bzr merge lp:~bregma/geis/fix-x11-mocks-ftbfs-in-ppa
Reviewer Review Type Date Requested Status
Chase Douglas (community) Approve
Review via email: mp+103526@code.launchpad.net

Description of the change

Fixes the current build failure in the uTouch daily PPA, and then fixes the subsequent 'make check' failure that occurs when the build does succeed.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

*urgh* I see an extra "GTEST_LIBS=-lpthread"... avert your eyes and pretend it's not there.

lp:~bregma/geis/fix-x11-mocks-ftbfs-in-ppa updated
260. By Stephen M. Webb

Fixed setting of GTEST_* variables in configury.

Revision history for this message
Chase Douglas (chasedouglas) wrote :

With the removal of the second GTEST_LIBS definition, everything looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'm4/gtest.m4'
2--- m4/gtest.m4 2012-04-24 16:10:12 +0000
3+++ m4/gtest.m4 2012-04-25 18:17:23 +0000
4@@ -45,7 +45,9 @@
5 [have_gtest=yes],
6 [have_gtest=no])
7
8- AS_IF([test "x$have_gtest_source" = xyes],
9- [AC_SUBST(GTEST_CPPFLAGS)]
10- [AC_SUBST(GTEST_SOURCE)])
11+ AS_IF([test "x$have_gtest" = xyes],
12+ [GTEST_LIBS=-lpthread
13+ AC_SUBST(GTEST_CPPFLAGS)
14+ AC_SUBST(GTEST_SOURCE)
15+ AC_SUBST(GTEST_LIBS)])
16 ]) # CHECK_GTEST
17
18=== modified file 'testsuite/geis2/Makefile.am'
19--- testsuite/geis2/Makefile.am 2012-04-24 16:12:33 +0000
20+++ testsuite/geis2/Makefile.am 2012-04-25 18:17:23 +0000
21@@ -59,10 +59,14 @@
22 -DTEST_ROOT_DIR=\"$(abs_top_srcdir)/testsuite/\"
23 $(GTEST_CFLAGS)
24
25+gtest_geis2_grail_backend_LDFLAGS = \
26+ -export-dynamic
27+
28 gtest_geis2_grail_backend_LDADD = \
29 $(top_builddir)/testsuite/gtest/libgtest_geis.a \
30 $(top_builddir)/testsuite/x11_mocks/libx11_mocks.a \
31- $(top_builddir)/libutouch-geis/libutouch-geis.la
32+ $(top_builddir)/libutouch-geis/libutouch-geis.la \
33+ $(GTEST_LIBS)
34
35 #### gtest_geis2_api - Integration tests using xorg-gest and evemu #####
36
37
38=== modified file 'testsuite/x11_mocks/Makefile.am'
39--- testsuite/x11_mocks/Makefile.am 2012-04-24 19:33:01 +0000
40+++ testsuite/x11_mocks/Makefile.am 2012-04-25 18:17:23 +0000
41@@ -8,6 +8,7 @@
42 libx11_mocks_a_SOURCES = \
43 x11_mocks.c
44
45-libx11_mocks_a_CFLAGS = \
46- --std=c99
47+libx11_mocks_a_CPPFLAGS = \
48+ --std=c99 \
49+ -Wno-unused-parameter
50
51
52=== modified file 'testsuite/x11_mocks/x11_mocks.c'
53--- testsuite/x11_mocks/x11_mocks.c 2012-04-24 16:11:31 +0000
54+++ testsuite/x11_mocks/x11_mocks.c 2012-04-25 18:17:23 +0000
55@@ -2,12 +2,11 @@
56 #define XLIB_ILLEGAL_ACCESS
57 #include <X11/Xlib.h>
58
59-#include <geis/geis.h>
60-
61 #include "x11_mocks.h"
62
63 #include <sys/eventfd.h>
64 #include <stdio.h>
65+#include <stdlib.h>
66 #include <unistd.h>
67
68 int xmock_xi2_opcode = 42;
69@@ -381,6 +380,7 @@
70 XMOCK_PRINT_FUNCTION;
71 (void)dpy;
72 (void)alarm;
73+ return Success;
74 }
75
76 void XSyncIntsToValue(
77
78=== modified file 'testsuite/x11_mocks/x11_mocks.h'
79--- testsuite/x11_mocks/x11_mocks.h 2012-04-24 16:11:31 +0000
80+++ testsuite/x11_mocks/x11_mocks.h 2012-04-25 18:17:23 +0000
81@@ -4,6 +4,7 @@
82 #include <X11/Xlib.h>
83 #include <X11/extensions/XInput2.h>
84 #include <X11/extensions/sync.h>
85+#include <stdint.h>
86
87 #ifdef __cplusplus
88 extern "C" {

Subscribers

People subscribed via source and target branches