test/apisix
1
0
Fork 0
mirror of https://gitee.com/iresty/apisix.git synced 2024-12-04 04:57:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: make CI pass again (#2619)

Browse Source
This commit is contained in:
罗泽轩 2020-11-04 15:45:27 +08:00 committed by GitHub
parent 61cd91440b
commit 366d5040cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 74 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis/linux_apisix_master_luarocks_runner.sh
View File

@ -60,6 +60,9 @@ script() {
sudo PATH=$PATH ./utils/install-apisix.sh install > build.log 2>&1 || (cat build.log && exit 1) sudo PATH=$PATH ./utils/install-apisix.sh install > build.log 2>&1 || (cat build.log && exit 1)
which apisix which apisix
# TODO: DELETE ME AFTER
sudo cp ../bin/apisix /usr/bin/apisix
lua -e 'print(package.path)'
# run test # run test
sudo PATH=$PATH apisix help sudo PATH=$PATH apisix help
@ -72,6 +75,10 @@ script() {
# install APISIX by luarocks # install APISIX by luarocks
sudo luarocks install $APISIX_MAIN > build.log 2>&1 || (cat build.log && exit 1) sudo luarocks install $APISIX_MAIN > build.log 2>&1 || (cat build.log && exit 1)
# TODO: DELETE ME AFTER
sudo cp ../bin/apisix /usr/bin/apisix
lua -e 'print(package.path)'
# show install files # show install files
luarocks show apisix luarocks show apisix

101
apisix/cli/env.lua
View File

@ -15,6 +15,7 @@
-- limitations under the License. -- limitations under the License.
-- --
local require = require
local util = require("apisix.cli.util") local util = require("apisix.cli.util")
local pcall = pcall local pcall = pcall
@ -22,61 +23,59 @@ local error = error
local exit = os.exit local exit = os.exit
local stderr = io.stderr local stderr = io.stderr
local str_find = string.find local str_find = string.find
local pkg_cpath_org = package.cpath local arg = arg
local pkg_path_org = package.path local package = package
local min_etcd_version = "3.4.0"
local apisix_home = "/usr/local/apisix"
local pkg_cpath = apisix_home .. "/deps/lib64/lua/5.1/?.so;"
.. apisix_home .. "/deps/lib/lua/5.1/?.so;;"
local pkg_path = apisix_home .. "/deps/share/lua/5.1/?.lua;;"
-- only for developer, use current folder as working space return function (apisix_home, pkg_cpath_org, pkg_path_org)
local is_root_path = false -- only for developer, use current folder as working space
local script_path = arg[0] local is_root_path = false
if script_path:sub(1, 2) == './' then local script_path = arg[0]
apisix_home = util.trim(util.execute_cmd("pwd")) if script_path:sub(1, 2) == './' then
if not apisix_home then apisix_home = util.trim(util.execute_cmd("pwd"))
error("failed to fetch current path") if not apisix_home then
error("failed to fetch current path")
end
if str_find(apisix_home .. "/", '/root/', nil, true) == 1 then
is_root_path = true
end
local pkg_cpath = apisix_home .. "/deps/lib64/lua/5.1/?.so;"
.. apisix_home .. "/deps/lib/lua/5.1/?.so;"
local pkg_path = apisix_home .. "/?/init.lua;"
.. apisix_home .. "/deps/share/lua/5.1/?.lua;;"
package.cpath = pkg_cpath .. package.cpath
package.path = pkg_path .. package.path
end end
if str_find(apisix_home .. "/", '/root/', nil, true) == 1 then do
is_root_path = true -- skip luajit environment
end local ok = pcall(require, "table.new")
if not ok then
pkg_cpath = apisix_home .. "/deps/lib64/lua/5.1/?.so;" local ok, json = pcall(require, "cjson")
.. apisix_home .. "/deps/lib/lua/5.1/?.so;" if ok and json then
stderr:write("please remove the cjson library in Lua, it may "
pkg_path = apisix_home .. "/?/init.lua;" .. "conflict with the cjson library in openresty. "
.. apisix_home .. "/deps/share/lua/5.1/?.lua;;" .. "\n luarocks remove cjson\n")
end exit(1)
end
package.cpath = pkg_cpath .. pkg_cpath_org
package.path = pkg_path .. pkg_path_org
do
-- skip luajit environment
local ok = pcall(require, "table.new")
if not ok then
local ok, json = pcall(require, "cjson")
if ok and json then
stderr:write("please remove the cjson library in Lua, it may "
.. "conflict with the cjson library in openresty. "
.. "\n luarocks remove cjson\n")
exit(1)
end end
end end
local openresty_args = [[openresty -p ]] .. apisix_home .. [[ -c ]]
.. apisix_home .. [[/conf/nginx.conf]]
local min_etcd_version = "3.4.0"
return {
apisix_home = apisix_home,
is_root_path = is_root_path,
openresty_args = openresty_args,
pkg_cpath_org = pkg_cpath_org,
pkg_path_org = pkg_path_org,
min_etcd_version = min_etcd_version,
}
end end
local openresty_args = [[openresty -p ]] .. apisix_home .. [[ -c ]]
.. apisix_home .. [[/conf/nginx.conf]]
return {
apisix_home = apisix_home,
is_root_path = is_root_path,
openresty_args = openresty_args,
pkg_cpath_org = pkg_cpath_org,
pkg_path_org = pkg_path_org,
min_etcd_version = min_etcd_version,
}

17
bin/apisix
View File

@ -17,7 +17,24 @@
-- limitations under the License. -- limitations under the License.
-- --
local pkg_cpath_org = package.cpath
local pkg_path_org = package.path
local apisix_home = "/usr/local/apisix"
local pkg_cpath = apisix_home .. "/deps/lib64/lua/5.1/?.so;"
.. apisix_home .. "/deps/lib/lua/5.1/?.so;;"
local pkg_path = apisix_home .. "/deps/share/lua/5.1/?.lua;;"
-- modify the load path to load our dependencies
package.cpath = pkg_cpath .. pkg_cpath_org
package.path = pkg_path .. pkg_path_org
-- FIXME DELETE AFTER MERGE
local env = require("apisix.cli.env") local env = require("apisix.cli.env")
if type(env) == 'function' then
-- the cached master one returns table instead of function
env = env(apisix_home, pkg_cpath_org, pkg_path_org)
end
local util = require("apisix.cli.util") local util = require("apisix.cli.util")
local ngx_tpl = require("apisix.cli.ngx_tpl") local ngx_tpl = require("apisix.cli.ngx_tpl")
local yaml = require("tinyyaml") local yaml = require("tinyyaml")