libmemcached

Merge lp:~piotr-sikora/libmemcached/openbsd-fixes into lp:~tangent-org/libmemcached/trunk

  1. openbsd-fixes
  2. Merge into trunk
Proposed by Piotr Sikora
Status: Merged
Merged at revision: 885
Proposed branch: lp:~piotr-sikora/libmemcached/openbsd-fixes
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: 163 lines (+19/-19)
3 files modified
tests/include.am (+15/-15)
tests/mem_functions.c (+2/-2)
tests/server.c (+2/-2)
To merge this branch: bzr merge lp:~piotr-sikora/libmemcached/openbsd-fixes
Reviewer Review Type Date Requested Status
Libmemcached-developers Pending
Review via email: mp+30799@code.launchpad.net

Description of the change

OpenBSD fixes.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/include.am'
2--- tests/include.am 2010-06-30 19:44:33 +0000
3+++ tests/include.am 2010-07-23 16:43:40 +0000
4@@ -92,20 +92,20 @@
5 test: check
6
7 check-local: test-docs test-mem test-hash memcapable
8- echo "Tests completed"
9+ @echo "Tests completed"
10
11 test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
12- echo "Tests completed"
13+ @echo "Tests completed"
14
15 memcapable: clients/memcapable
16- @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
17+ @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
18 @clients/memcapable -p 12555 || echo "Your memcached server does not support all commands"
19 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
20 @rm tests/Xumemc.pid
21
22 test-memcat: clients/memcat clients/memcp
23 @echo "Testing memcat"
24- @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
25+ @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
26 @clients/memcp --servers="localhost:12555" `pwd`/clients/memcp
27 @clients/memcat --servers="localhost:12555" memcp > `pwd`/tests/scratch
28 @clients/memcat --servers="localhost:12555" --file=`pwd`/tests/scratch2 memcp
29@@ -117,7 +117,7 @@
30
31 valgrind-memcat: clients/memcat clients/memcp
32 @echo "Testing memcat"
33- @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
34+ @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
35 @clients/memcp --servers="localhost:12555" clients/memcp
36 @$(VALGRIND_COMMAND) clients/memcat --servers="localhost:12555" memcp > tests/scratch
37 # @diff clients/memcp tests/scratch
38@@ -127,21 +127,21 @@
39
40 test-memcp: clients/memcp
41 @echo "Testing memcp"
42- @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
43+ @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
44 @clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat
45 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
46 @rm tests/Xumemc.pid
47
48 valgrind-memcp: clients/memcat clients/memcp
49 @echo "Testing memcp"
50- @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
51+ @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
52 @$(VALGRIND_COMMAND) clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat
53 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
54 @rm tests/Xumemc.pid
55
56 test-memrm: clients/memrm clients/memcp
57 @echo "Testing memrm"
58- @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
59+ @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
60 @clients/memcp --servers="localhost:12555" clients/memcat
61 @clients/memrm --servers="localhost:12555" memcat
62 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
63@@ -149,7 +149,7 @@
64
65 valgrind-memrm: clients/memcat clients/memcp
66 @echo "Testing memrm"
67- @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
68+ @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
69 @clients/memcp --servers="localhost:12555" clients/memcat
70 @$(VALGRIND_COMMAND) clients/memrm --servers="localhost:12555" memcat
71 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
72@@ -157,21 +157,21 @@
73
74 test-memflush: clients/memflush
75 @echo "Testing memflush"
76- @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
77+ @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
78 @clients/memflush --servers="localhost:12555"
79 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
80 @rm tests/Xumemc.pid
81
82 valgrind-memflush: clients/memflush
83 @echo "Testing memflush"
84- @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
85+ @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
86 @$(VALGRIND_COMMAND) clients/memflush --servers="localhost:12555"
87 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
88 @rm tests/Xumemc.pid
89
90 test-memdump: clients/memdump clients/memcp
91 @echo "Testing memdump"
92- @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
93+ @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
94 @clients/memcp --servers="localhost:12555" clients/memcat
95 @clients/memdump --servers="localhost:12555" > /dev/null
96 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
97@@ -179,7 +179,7 @@
98
99 valgrind-memdump: clients/memcat clients/memcp
100 @echo "Testing memdump"
101- @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
102+ @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
103 @clients/memcp --servers="localhost:12555" clients/memcat
104 @$(VALGRIND_COMMAND) clients/memdump --servers="localhost:12555" > /dev/null
105 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
106@@ -187,14 +187,14 @@
107
108 test-memstat: clients/memstat
109 @echo "Testing memstat"
110- @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
111+ @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
112 @clients/memstat --servers="localhost:12555" > /dev/null
113 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
114 @rm tests/Xumemc.pid
115
116 valgrind-memstat: clients/memstat
117 @echo "Testing memstat"
118- @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
119+ @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
120 @$(VALGRIND_COMMAND) clients/memstat --servers="localhost:12555" > /dev/null
121 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
122 @rm tests/Xumemc.pid
123
124=== modified file 'tests/mem_functions.c'
125--- tests/mem_functions.c 2010-07-20 04:45:48 +0000
126+++ tests/mem_functions.c 2010-07-23 16:43:40 +0000
127@@ -2781,7 +2781,7 @@
128 return TEST_SUCCESS;
129 }
130
131-#ifndef __sun
132+#if !defined(__sun) && !defined(__OpenBSD__)
133 /* Check the validity of chinese key*/
134 static test_return_t user_supplied_bug17(memcached_st *memc)
135 {
136@@ -6216,7 +6216,7 @@
137 {"user_supplied_bug14", 1, (test_callback_fn)user_supplied_bug14 },
138 {"user_supplied_bug15", 1, (test_callback_fn)user_supplied_bug15 },
139 {"user_supplied_bug16", 1, (test_callback_fn)user_supplied_bug16 },
140-#ifndef __sun
141+#if !defined(__sun) && !defined(__OpenBSD__)
142 /*
143 ** It seems to be something weird with the character sets..
144 ** value_fetch is unable to parse the value line (iscntrl "fails"), so I
145
146=== modified file 'tests/server.c'
147--- tests/server.c 2010-07-16 19:24:58 +0000
148+++ tests/server.c 2010-07-23 16:43:40 +0000
149@@ -73,12 +73,12 @@
150
151 if (x == 0)
152 {
153- sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u -m 128",
154+ sprintf(buffer, "%s -d -u root -P /tmp/%umemc.pid -t 1 -p %u -U %u -m 128",
155 MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE);
156 }
157 else
158 {
159- sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u",
160+ sprintf(buffer, "%s -d -u root -P /tmp/%umemc.pid -t 1 -p %u -U %u",
161 MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE);
162 }
163 if (libmemcached_util_ping("localhost", (in_port_t)(x + TEST_PORT_BASE), NULL))

Subscribers

People subscribed via source and target branches

to all changes: