1). update nemo for commit 652710 2). add DISABLE_UPDATE_SB

liegoo · Aug 8, 2017 · 9f2ebb2 · 9f2ebb2
1 parent 6527105
commit 9f2ebb2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -20,8 +20,10 @@ ifeq ($(MAKECMDGOALS),dbg)
   DEBUG_LEVEL=2
 endif
 
+ifneq ($(DISABLE_UPDATE_SB), 1)
 $(info updating submodule)
 dummy := $(shell (git submodule init && git submodule update))
+endif
 
 # compile with -O2 if debug level is not 2
 ifneq ($(DEBUG_LEVEL), 2)

diff --git a/tests/README.md b/tests/README.md
@@ -1,5 +1,4 @@
 ### Pika test
 
- * 删除上次执行的db, log目录
- * 在Pika目录下执行 `sudo ./pikatests.sh geo` 测试Pika GEO命令
- * 如果是`unit/type`接口, 例如 SET, 执行 `sudo ./pikatests.sh type/set` 测试Pika SET命令
+ * 在Pika目录下执行 `./pikatests.sh geo` 测试Pika GEO命令
+ * 如果是`unit/type`接口, 例如 SET, 执行 `./pikatests.sh type/set` 测试Pika SET命令
diff --git a/tests/assets/default.conf b/tests/assets/default.conf
@@ -32,6 +32,8 @@ dump-prefix :
 #slotmigrate : no
 # Dump Path
 dump-path : ./dump/
+# Expire-dump-days
+dump-expire : 0
 # pidfile Path
 pidfile : ./pika.pid
 # Max Connection

diff --git a/third/nemo b/third/nemo