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
=== modified file 'tests/include.am'
--- tests/include.am 2010-06-30 19:44:33 +0000
+++ tests/include.am 2010-07-23 16:43:40 +0000
@@ -92,20 +92,20 @@
92test: check92test: check
9393
94check-local: test-docs test-mem test-hash memcapable94check-local: test-docs test-mem test-hash memcapable
95 echo "Tests completed"95 @echo "Tests completed"
9696
97test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat97test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
98 echo "Tests completed"98 @echo "Tests completed"
9999
100memcapable: clients/memcapable100memcapable: clients/memcapable
101 @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555101 @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
102 @clients/memcapable -p 12555 || echo "Your memcached server does not support all commands"102 @clients/memcapable -p 12555 || echo "Your memcached server does not support all commands"
103 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"103 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
104 @rm tests/Xumemc.pid104 @rm tests/Xumemc.pid
105105
106test-memcat: clients/memcat clients/memcp106test-memcat: clients/memcat clients/memcp
107 @echo "Testing memcat"107 @echo "Testing memcat"
108 @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555108 @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
109 @clients/memcp --servers="localhost:12555" `pwd`/clients/memcp109 @clients/memcp --servers="localhost:12555" `pwd`/clients/memcp
110 @clients/memcat --servers="localhost:12555" memcp > `pwd`/tests/scratch110 @clients/memcat --servers="localhost:12555" memcp > `pwd`/tests/scratch
111 @clients/memcat --servers="localhost:12555" --file=`pwd`/tests/scratch2 memcp111 @clients/memcat --servers="localhost:12555" --file=`pwd`/tests/scratch2 memcp
@@ -117,7 +117,7 @@
117117
118valgrind-memcat: clients/memcat clients/memcp118valgrind-memcat: clients/memcat clients/memcp
119 @echo "Testing memcat"119 @echo "Testing memcat"
120 @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555120 @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
121 @clients/memcp --servers="localhost:12555" clients/memcp121 @clients/memcp --servers="localhost:12555" clients/memcp
122 @$(VALGRIND_COMMAND) clients/memcat --servers="localhost:12555" memcp > tests/scratch122 @$(VALGRIND_COMMAND) clients/memcat --servers="localhost:12555" memcp > tests/scratch
123# @diff clients/memcp tests/scratch123# @diff clients/memcp tests/scratch
@@ -127,21 +127,21 @@
127127
128test-memcp: clients/memcp128test-memcp: clients/memcp
129 @echo "Testing memcp"129 @echo "Testing memcp"
130 @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555130 @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
131 @clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat131 @clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat
132 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"132 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
133 @rm tests/Xumemc.pid133 @rm tests/Xumemc.pid
134134
135valgrind-memcp: clients/memcat clients/memcp135valgrind-memcp: clients/memcat clients/memcp
136 @echo "Testing memcp"136 @echo "Testing memcp"
137 @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555137 @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
138 @$(VALGRIND_COMMAND) clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat138 @$(VALGRIND_COMMAND) clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat
139 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"139 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
140 @rm tests/Xumemc.pid140 @rm tests/Xumemc.pid
141141
142test-memrm: clients/memrm clients/memcp142test-memrm: clients/memrm clients/memcp
143 @echo "Testing memrm"143 @echo "Testing memrm"
144 @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555144 @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
145 @clients/memcp --servers="localhost:12555" clients/memcat145 @clients/memcp --servers="localhost:12555" clients/memcat
146 @clients/memrm --servers="localhost:12555" memcat146 @clients/memrm --servers="localhost:12555" memcat
147 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"147 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
@@ -149,7 +149,7 @@
149149
150valgrind-memrm: clients/memcat clients/memcp150valgrind-memrm: clients/memcat clients/memcp
151 @echo "Testing memrm"151 @echo "Testing memrm"
152 @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555152 @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
153 @clients/memcp --servers="localhost:12555" clients/memcat153 @clients/memcp --servers="localhost:12555" clients/memcat
154 @$(VALGRIND_COMMAND) clients/memrm --servers="localhost:12555" memcat154 @$(VALGRIND_COMMAND) clients/memrm --servers="localhost:12555" memcat
155 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"155 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
@@ -157,21 +157,21 @@
157157
158test-memflush: clients/memflush158test-memflush: clients/memflush
159 @echo "Testing memflush"159 @echo "Testing memflush"
160 @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555160 @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
161 @clients/memflush --servers="localhost:12555"161 @clients/memflush --servers="localhost:12555"
162 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"162 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
163 @rm tests/Xumemc.pid163 @rm tests/Xumemc.pid
164164
165valgrind-memflush: clients/memflush165valgrind-memflush: clients/memflush
166 @echo "Testing memflush"166 @echo "Testing memflush"
167 @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555167 @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
168 @$(VALGRIND_COMMAND) clients/memflush --servers="localhost:12555"168 @$(VALGRIND_COMMAND) clients/memflush --servers="localhost:12555"
169 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"169 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
170 @rm tests/Xumemc.pid170 @rm tests/Xumemc.pid
171171
172test-memdump: clients/memdump clients/memcp172test-memdump: clients/memdump clients/memcp
173 @echo "Testing memdump"173 @echo "Testing memdump"
174 @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555174 @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
175 @clients/memcp --servers="localhost:12555" clients/memcat175 @clients/memcp --servers="localhost:12555" clients/memcat
176 @clients/memdump --servers="localhost:12555" > /dev/null176 @clients/memdump --servers="localhost:12555" > /dev/null
177 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"177 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
@@ -179,7 +179,7 @@
179179
180valgrind-memdump: clients/memcat clients/memcp180valgrind-memdump: clients/memcat clients/memcp
181 @echo "Testing memdump"181 @echo "Testing memdump"
182 @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555182 @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
183 @clients/memcp --servers="localhost:12555" clients/memcat183 @clients/memcp --servers="localhost:12555" clients/memcat
184 @$(VALGRIND_COMMAND) clients/memdump --servers="localhost:12555" > /dev/null184 @$(VALGRIND_COMMAND) clients/memdump --servers="localhost:12555" > /dev/null
185 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"185 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
@@ -187,14 +187,14 @@
187187
188test-memstat: clients/memstat188test-memstat: clients/memstat
189 @echo "Testing memstat"189 @echo "Testing memstat"
190 @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555190 @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
191 @clients/memstat --servers="localhost:12555" > /dev/null191 @clients/memstat --servers="localhost:12555" > /dev/null
192 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"192 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
193 @rm tests/Xumemc.pid193 @rm tests/Xumemc.pid
194194
195valgrind-memstat: clients/memstat195valgrind-memstat: clients/memstat
196 @echo "Testing memstat"196 @echo "Testing memstat"
197 @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555197 @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
198 @$(VALGRIND_COMMAND) clients/memstat --servers="localhost:12555" > /dev/null198 @$(VALGRIND_COMMAND) clients/memstat --servers="localhost:12555" > /dev/null
199 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"199 @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
200 @rm tests/Xumemc.pid200 @rm tests/Xumemc.pid
201201
=== modified file 'tests/mem_functions.c'
--- tests/mem_functions.c 2010-07-20 04:45:48 +0000
+++ tests/mem_functions.c 2010-07-23 16:43:40 +0000
@@ -2781,7 +2781,7 @@
2781 return TEST_SUCCESS;2781 return TEST_SUCCESS;
2782}2782}
27832783
2784#ifndef __sun2784#if !defined(__sun) && !defined(__OpenBSD__)
2785/* Check the validity of chinese key*/2785/* Check the validity of chinese key*/
2786static test_return_t user_supplied_bug17(memcached_st *memc)2786static test_return_t user_supplied_bug17(memcached_st *memc)
2787{2787{
@@ -6216,7 +6216,7 @@
6216 {"user_supplied_bug14", 1, (test_callback_fn)user_supplied_bug14 },6216 {"user_supplied_bug14", 1, (test_callback_fn)user_supplied_bug14 },
6217 {"user_supplied_bug15", 1, (test_callback_fn)user_supplied_bug15 },6217 {"user_supplied_bug15", 1, (test_callback_fn)user_supplied_bug15 },
6218 {"user_supplied_bug16", 1, (test_callback_fn)user_supplied_bug16 },6218 {"user_supplied_bug16", 1, (test_callback_fn)user_supplied_bug16 },
6219#ifndef __sun6219#if !defined(__sun) && !defined(__OpenBSD__)
6220 /*6220 /*
6221 ** It seems to be something weird with the character sets..6221 ** It seems to be something weird with the character sets..
6222 ** value_fetch is unable to parse the value line (iscntrl "fails"), so I6222 ** value_fetch is unable to parse the value line (iscntrl "fails"), so I
62236223
=== modified file 'tests/server.c'
--- tests/server.c 2010-07-16 19:24:58 +0000
+++ tests/server.c 2010-07-23 16:43:40 +0000
@@ -73,12 +73,12 @@
7373
74 if (x == 0)74 if (x == 0)
75 {75 {
76 sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u -m 128",76 sprintf(buffer, "%s -d -u root -P /tmp/%umemc.pid -t 1 -p %u -U %u -m 128",
77 MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE);77 MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE);
78 }78 }
79 else79 else
80 {80 {
81 sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u",81 sprintf(buffer, "%s -d -u root -P /tmp/%umemc.pid -t 1 -p %u -U %u",
82 MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE);82 MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE);
83 }83 }
84 if (libmemcached_util_ping("localhost", (in_port_t)(x + TEST_PORT_BASE), NULL))84 if (libmemcached_util_ping("localhost", (in_port_t)(x + TEST_PORT_BASE), NULL))

Subscribers

People subscribed via source and target branches

to all changes: