Skip to content

Commit

Permalink
Migrate tarantoolctl from tarantool repository
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ochaplashkin committed Jul 28, 2023
1 parent 455c148 commit 8b7283d
Show file tree
Hide file tree
Showing 2 changed files with 1,354 additions and 5 deletions.
6 changes: 1 addition & 5 deletions lib/tarantool_server.py
Expand Up @@ -702,11 +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 or 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
if os.path.isdir(ctl) or not os.access(ctl, os.X_OK):
Expand Down

0 comments on commit 8b7283d

Please sign in to comment.