Skip to content

Commit

Permalink
Migrate tarantoolctl from tarantool repository
Browse files Browse the repository at this point in the history
Since Tarantool 3.0.0-alpha1 [1] is not going to be distributed as a set
of packages for specific distros. The tarantoolctl utility is in the
old packages but it will not be in the new ones [2][3].

Utility was added to the root directory of the project for a test run.
Now the test run will always use the local tarantoolctl.

Despite this changes the tests should be rewritten to use `tt` instead
of `tarantoolctl` because it will be replaced.

[1] https://github.com/tarantool/tarantool/releases/tag/3.0.0-alpha1
[2] tarantool/tarantool#8771
[3] tarantool/tarantool#8866
[4] tarantool/tarantool#8484

Close #400
  • Loading branch information
ochaplashkin committed Jul 27, 2023
1 parent 94842b7 commit 41ed0bd
Show file tree
Hide file tree
Showing 2 changed files with 1,354 additions and 4 deletions.
5 changes: 1 addition & 4 deletions lib/tarantool_server.py
Expand Up @@ -702,10 +702,7 @@ def find_exe(cls, builddir, silent=True, executable=None):
color_log(path + ' ...\n', schema='path')
for _dir in path.split(os.pathsep):
exe = executable if executable else os.path.join(_dir, cls.default_tarantool["bin"])
ctl_dir = _dir
# check local tarantoolctl source
if _dir == builddir:
ctl_dir = os.path.join(_dir, '../extra/dist')
ctl_dir = cls.TEST_RUN_DIR
ctl = os.path.join(ctl_dir, cls.default_tarantool['ctl'])

need_lua_path = False
Expand Down

0 comments on commit 41ed0bd

Please sign in to comment.