averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix Travis test

Browse Source
This commit is contained in:
chrox
2015-03-21 17:02:25 +08:00
parent e416a58cd7
commit 2f2611af42
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -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

2
base

Submodule base updated: bfa380e9f0...093b0551c0

4
spec/unit/commonrequire.lua
View File

@@ -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")

4
spec/unit/kosync_spec.lua
View File

@@ -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" : {

6
spec/unit/spore_spec.lua
View File

@@ -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()