File tree Expand file tree Collapse file tree 9 files changed +33
-22
lines changed Expand file tree Collapse file tree 9 files changed +33
-22
lines changed Original file line number Diff line number Diff line change @@ -31,11 +31,15 @@ jobs:
31
31
python-version : ${{ matrix.python-version }}
32
32
- name : display python version
33
33
run : python -c "import sys; print(sys.version)"
34
+ - name : setup tt
35
+ run : |
36
+ curl -L https://tarantool.io/release/2/installer.sh | sudo bash
37
+ sudo apt install -y tt
38
+ tt version
34
39
- name : setup dependencies
35
40
run : |
36
- sudo apt update -y
37
- sudo apt-get -y install lua5.1 luarocks
38
- sudo luarocks install luacheck
41
+ tt rocks install luatest
42
+ tt rocks install luacheck
39
43
- name : setup python dependencies
40
44
run : |
41
45
pip install -r requirements.txt
Original file line number Diff line number Diff line change 4
4
[submodule "lib/tarantool-python "]
5
5
path = lib/tarantool-python
6
6
url = https://github.com/tarantool/tarantool-python.git
7
- [submodule "lib/checks "]
8
- path = lib/checks
9
- url = https://github.com/tarantool/checks.git
10
- [submodule "lib/luatest "]
11
- path = lib/luatest
12
- url = https://github.com/tarantool/luatest.git
Original file line number Diff line number Diff line change @@ -27,6 +27,5 @@ include_files = {
27
27
exclude_files = {
28
28
" lib/tarantool-python" ,
29
29
" test/test-tarantool/*.test.lua" ,
30
- " lib/luatest/**" ,
31
- " lib/checks/**" ,
30
+ " .rocks/**/*.lua" ,
32
31
}
Original file line number Diff line number Diff line change
1
+ export PATH := .rocks/bin:$(PATH )
2
+
1
3
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
2
4
PROJECT_DIR := $(patsubst % /,% ,$(dir $(MAKEFILE_PATH ) ) )
3
5
TEST_RUN_EXTRA_PARAMS? =
Original file line number Diff line number Diff line change
1
+ #!/usr/bin/env tarantool
2
+
3
+ --
4
+ -- Add the luatest module to LUA_PATH so that it can be used in processes
5
+ -- spawned by tests.
6
+ --
7
+ local fio = require('fio')
8
+ local path = package.search('luatest')
9
+ if path == nil then
10
+ error('luatest not found')
11
+ end
12
+ path = fio.dirname(path) -- strip init.lua
13
+ path = fio.dirname(path) -- strip luatest
14
+ os.setenv('LUA_PATH',
15
+ path .. '/?.lua;' .. path .. '/?/init.lua;' ..
16
+ (os.getenv('LUA_PATH') or ';'))
17
+
18
+ print(('Tarantool version is %s'):format(require('tarantool').version))
19
+
20
+ require('luatest.cli_entrypoint')()
Original file line number Diff line number Diff line change @@ -70,18 +70,12 @@ def module_init():
70
70
os .environ ["BUILDDIR" ] = BUILDDIR
71
71
soext = sys .platform == 'darwin' and 'dylib' or 'so'
72
72
73
- os .environ ['LUA_PATH' ] = (
74
- SOURCEDIR + '/?.lua;' + SOURCEDIR + '/?/init.lua;'
75
- + os .environ ['TEST_RUN_DIR' ] + '/lib/checks/?.lua;'
76
- + os .environ ['TEST_RUN_DIR' ] + '/lib/luatest/?/init.lua;'
77
- + os .environ ['TEST_RUN_DIR' ] + '/lib/luatest/?.lua;;'
78
- )
79
-
73
+ os .environ ["LUA_PATH" ] = SOURCEDIR + "/?.lua;" + SOURCEDIR + "/?/init.lua;;"
80
74
os .environ ["LUA_CPATH" ] = BUILDDIR + "/?." + soext + ";;"
81
75
os .environ ["REPLICATION_SYNC_TIMEOUT" ] = str (args .replication_sync_timeout )
82
76
os .environ ['MEMTX_ALLOCATOR' ] = args .memtx_allocator
83
77
84
- prepend_path (os .path .join (os .environ ['TEST_RUN_DIR' ], 'lib/luatest/ bin' ))
78
+ prepend_path (os .path .join (os .environ ['TEST_RUN_DIR' ], 'bin' ))
85
79
86
80
TarantoolServer .find_exe (args .builddir , executable = args .executable )
87
81
UnittestServer .find_exe (args .builddir )
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -125,7 +125,7 @@ def find_exe(cls, builddir):
125
125
cls .binary = TarantoolServer .binary
126
126
cls .debug = bool (re .findall (r'^Target:.*-Debug$' , str (cls .version ()),
127
127
re .M ))
128
- cls .luatest = os .environ ['TEST_RUN_DIR' ] + '/lib/luatest/ bin/luatest'
128
+ cls .luatest = os .environ ['TEST_RUN_DIR' ] + '/bin/luatest'
129
129
130
130
@classmethod
131
131
def verify_luatest_exe (cls ):
You can’t perform that action at this time.
0 commit comments