Skip to content

Commit ad43d8f

Browse files
Oleg Chaplashkinylobankov
Oleg Chaplashkin
authored andcommitted
Migrate tarantoolctl from tarantool repository
In the near future we plan to test Tarantool installed from a DEB/RPM package. Since 3.0.0-alpha1 release [1] Tarantool packages don't have the tarantoolctl utility inside [2][3]. So tarantoolctl was added to the root directory of the project. Now test-run will always use the local tarantoolctl. [1] https://github.com/tarantool/tarantool/releases/tag/3.0.0-alpha1 [2] tarantool/tarantool#8771 [3] tarantool/tarantool#8866 Close #400
1 parent 0a70001 commit ad43d8f

File tree

2 files changed

+1354
-5
lines changed

2 files changed

+1354
-5
lines changed

lib/tarantool_server.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -702,11 +702,7 @@ def find_exe(cls, builddir, silent=True, executable=None):
702702
color_log(path + ' ...\n', schema='path')
703703
for _dir in path.split(os.pathsep):
704704
exe = executable or os.path.join(_dir, cls.default_tarantool["bin"])
705-
ctl_dir = _dir
706-
# check local tarantoolctl source
707-
if _dir == builddir:
708-
ctl_dir = os.path.join(_dir, '../extra/dist')
709-
705+
ctl_dir = cls.TEST_RUN_DIR
710706
ctl = os.path.join(ctl_dir, cls.default_tarantool['ctl'])
711707
need_lua_path = False
712708
if os.path.isdir(ctl) or not os.access(ctl, os.X_OK):

0 commit comments

Comments
 (0)