libmemcached

Merge lp:~vjsamuel/libmemcached/fix-gearmand-binary-issue into lp:~tangent-org/libmemcached/trunk

  1. fix-gearmand-binary-issue
  2. Merge into trunk
Proposed by Vijay Samuel
Status: Merged
Merge reported by: Brian Aker
Merged at revision: not available
Proposed branch: lp:~vjsamuel/libmemcached/fix-gearmand-binary-issue
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: 66 lines (+7/-5)
5 files modified
libtest/common.h (+4/-0)
libtest/gearmand.cc (+0/-2)
libtest/skiptest.cc (+1/-1)
libtest/unittest.cc (+1/-1)
libtest/wait.cc (+1/-1)
To merge this branch: bzr merge lp:~vjsamuel/libmemcached/fix-gearmand-binary-issue
Reviewer Review Type Date Requested Status
Monty Taylor (community) Needs Fixing
Brian Aker Pending
Review via email: mp+78604@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Monty Taylor (mordred) wrote :

There is a better fix for this. As far as I can tell, the include of m4/gearmand.m4 is actually useless in this codebase, and is causing the error in conjunction with the -DGEARMAND_BINARY calls in libtest/include.am. The real solution here is to move the logic around setting all of the symbols set with -D in libtest/include.am into configure.ac, and then to rely on the symbols being in config.h rather than injecting them onto the command line in the makefile.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libtest/common.h'
2--- libtest/common.h 2011-09-08 19:41:50 +0000
3+++ libtest/common.h 2011-10-07 14:08:30 +0000
4@@ -25,6 +25,10 @@
5
6 #pragma once
7
8+#if defined GEARMAND_BINARY
9+#undef GEARMAND_BINARY
10+#endif
11+
12 #include <config.h>
13
14 #include <cassert>
15
16=== modified file 'libtest/gearmand.cc'
17--- libtest/gearmand.cc 2011-08-15 06:40:24 +0000
18+++ libtest/gearmand.cc 2011-10-07 14:08:30 +0000
19@@ -22,8 +22,6 @@
20
21 #include <libtest/common.h>
22
23-#include <libtest/gearmand.h>
24-
25 #include "util/instance.hpp"
26 #include "util/operation.hpp"
27
28
29=== modified file 'libtest/skiptest.cc'
30--- libtest/skiptest.cc 2011-08-15 06:40:24 +0000
31+++ libtest/skiptest.cc 2011-10-07 14:08:30 +0000
32@@ -20,7 +20,7 @@
33 */
34
35
36-#include <config.h>
37+#include "config.h"
38
39 #include <libtest/test.hpp>
40
41
42=== modified file 'libtest/unittest.cc'
43--- libtest/unittest.cc 2011-09-19 04:08:52 +0000
44+++ libtest/unittest.cc 2011-10-07 14:08:30 +0000
45@@ -20,7 +20,7 @@
46 */
47
48
49-#include <config.h>
50+#include <libtest/common.h>
51
52 #include <libtest/test.hpp>
53
54
55=== modified file 'libtest/wait.cc'
56--- libtest/wait.cc 2011-09-19 04:08:52 +0000
57+++ libtest/wait.cc 2011-10-07 14:08:30 +0000
58@@ -19,7 +19,7 @@
59 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
60 */
61
62-#include <config.h>
63+#include <libtest/common.h>
64
65 #include <cstdlib>
66 #include <fcntl.h>

Subscribers

People subscribed via source and target branches

to all changes: