Skip to content

Migrate tarantoolctl from the tarantool repository #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ylobankov merged 2 commits into from
Jul 28, 2023
Merged

Migrate tarantoolctl from the tarantool repository #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
455c148
Add ability to set path to executable file
Jul 19, 2023
8b7283d
Migrate tarantoolctl from tarantool repository
Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def module_init():

prepend_path(os.path.join(os.environ['TEST_RUN_DIR'], 'lib/luatest/bin'))

TarantoolServer.find_exe(args.builddir)
TarantoolServer.find_exe(args.builddir, executable=args.executable)
UnittestServer.find_exe(args.builddir)
AppServer.find_exe(args.builddir)
LuatestServer.find_exe(args.builddir)
Expand Down
11 changes: 11 additions & 0 deletions lib/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,17 @@ def __init__(self):
$ . <(./test/test-run.py --env)
"""))

parser.add_argument(
'--executable',
dest='executable',
default=None,
help=format_help(
"""
Set a custom path to the Tarantool executable.

Useful when Tarantool binary is not in $BUILDDIR and $PATH.
"""))

# XXX: We can use parser.parse_intermixed_args() on
# Python 3.7 to understand commands like
# ./test-run.py foo --exclude bar baz
Expand Down
10 changes: 3 additions & 7 deletions lib/tarantool_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,19 +694,15 @@ def __init__(self, _ini=None, test_suite=None):
self.current_test = caller_globals['test_run_current_test']

@classmethod
def find_exe(cls, builddir, silent=True):
def find_exe(cls, builddir, silent=True, executable=None):
cls.builddir = os.path.abspath(builddir)
builddir = os.path.join(builddir, "src")
path = builddir + os.pathsep + os.environ["PATH"]
color_log("Looking for server binary in ", schema='serv_text')
color_log(path + ' ...\n', schema='path')
for _dir in path.split(os.pathsep):
exe = 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')

exe = executable or os.path.join(_dir, cls.default_tarantool["bin"])
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
Loading