File tree Expand file tree Collapse file tree 2 files changed +2
-8
lines changed Expand file tree Collapse file tree 2 files changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -34,9 +34,6 @@ stop_all: stop_sentinel stop_slave stop stop_cluster
34
34
${TMP} :
35
35
@mkdir -p $@
36
36
37
- ${CONF} :
38
- @touch $@
39
-
40
37
${BINARY} : ${TMP}
41
38
@bin/build ${REDIS_BRANCH} $<
42
39
47
44
@$(call kill-redis,${PID_PATH}) ; \
48
45
49
46
start : ${BINARY}
50
- @${BINARY} ${CONF} \
47
+ @cp ${CONF} ${TMP} /redis.conf; \
48
+ ${BINARY} ${TMP} /redis.conf \
51
49
--daemonize yes\
52
50
--pidfile ${PID_PATH} \
53
51
--port ${PORT} \
Original file line number Diff line number Diff line change @@ -246,8 +246,6 @@ def test_hscan_with_encoding
246
246
247
247
r . hmset "hash" , *elements
248
248
249
- assert_equal enc . to_s , r . object ( "encoding" , "hash" )
250
-
251
249
cursor = 0
252
250
all_key_values = [ ]
253
251
loop do
@@ -345,8 +343,6 @@ def test_zscan_with_encoding
345
343
346
344
r . zadd "zset" , elements
347
345
348
- assert_equal enc . to_s , r . object ( "encoding" , "zset" )
349
-
350
346
cursor = 0
351
347
all_key_scores = [ ]
352
348
loop do
You can’t perform that action at this time.
0 commit comments