From 2f2611af424081ae01d0e901efaaa4afcc1c8524 Mon Sep 17 00:00:00 2001
From: chrox <chrox.huang@gmail.com>
Date: Sat, 21 Mar 2015 17:02:25 +0800
Subject: [PATCH] fix Travis test

---
 Makefile                    | 2 +-
 base                        | 2 +-
 spec/unit/commonrequire.lua | 4 ++--
 spec/unit/kosync_spec.lua   | 4 +---
 spec/unit/spore_spec.lua    | 6 ++----
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 55f7f669b..1bad03147 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ $(INSTALL_DIR)/koreader/.luacov:
 		ln -sf ../../.luacov $(INSTALL_DIR)/koreader
 
 testfront: $(INSTALL_DIR)/koreader/.busted
-	cd $(INSTALL_DIR)/koreader && busted -l ./luajit
+	cd $(INSTALL_DIR)/koreader && busted -l ./luajit --exclude-tags=notest
 
 test:
 	$(MAKE) -C $(KOR_BASE) test
diff --git a/base b/base
index bfa380e9f..093b0551c 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit bfa380e9f05dcb229d86f7ac2820abb161c295d3
+Subproject commit 093b0551c03014453cd0c85f90ba7ad4169cd299
diff --git a/spec/unit/commonrequire.lua b/spec/unit/commonrequire.lua
index e9aedbf65..2e0f49531 100644
--- a/spec/unit/commonrequire.lua
+++ b/spec/unit/commonrequire.lua
@@ -1,6 +1,6 @@
 require "defaults"
-package.path = "?.lua;common/?.lua;frontend/?.lua;" .. package.path
-package.cpath = "?.so;common/?.so;/usr/lib/lua/?.so;" .. package.cpath
+package.path = "?.lua;common/?.lua;rocks/share/lua/5.1/?.lua;frontend/?.lua;" .. package.path
+package.cpath = "?.so;common/?.so;/usr/lib/lua/?.so;rocks/lib/lua/5.1/?.so;" .. package.cpath
 
 -- global reader settings
 local DocSettings = require("docsettings")
diff --git a/spec/unit/kosync_spec.lua b/spec/unit/kosync_spec.lua
index 788a70a2a..279b3339d 100644
--- a/spec/unit/kosync_spec.lua
+++ b/spec/unit/kosync_spec.lua
@@ -1,5 +1,3 @@
-package.path = "rocks/share/lua/5.1/?.lua;" .. package.path
-package.cpath = "rocks/lib/lua/5.1/?.so;" .. package.cpath
 require("commonrequire")
 local UIManager = require("ui/uimanager")
 local HTTPClient = require("httpclient")
@@ -9,7 +7,7 @@ local md5 = require("MD5")
 
 local service = [[
 {
-    "base_url" : "https://192.168.1.101:7200",
+    "base_url" : "https://vislab.bjmu.edu.cn:7200",
     "name" : "api",
     "methods" : {
         "register" : {
diff --git a/spec/unit/spore_spec.lua b/spec/unit/spore_spec.lua
index 612bc50db..d8a04aff1 100644
--- a/spec/unit/spore_spec.lua
+++ b/spec/unit/spore_spec.lua
@@ -1,5 +1,3 @@
-package.path = "rocks/share/lua/5.1/?.lua;" .. package.path
-package.cpath = "rocks/lib/lua/5.1/?.so;" .. package.cpath
 require("commonrequire")
 local UIManager = require("ui/uimanager")
 local HTTPClient = require("httpclient")
@@ -39,7 +37,7 @@ local service = [[
 }
 ]]
 
-describe("Lua Spore modules #nocov", function()
+describe("Lua Spore modules #notest #nocov", function()
     local Spore = require("Spore")
     local client = Spore.new_from_string(service)
     client:enable('Format.JSON')
@@ -55,7 +53,7 @@ describe("Lua Spore modules #nocov", function()
     end)
 end)
 
-describe("Lua Spore modules with async http request #nocov", function()
+describe("Lua Spore modules with async http request #notest #nocov", function()
     local Spore = require("Spore")
     local client = Spore.new_from_string(service)
     local async_http_client = HTTPClient:new()