diff --git a/test/box/bootstrap.result b/test/box/bootstrap.result index f055177023a8f2f3f94ab92a1a95811e99df6251..1faa074422a60d2573d094f506e9fc2e0f30e708 100644 --- a/test/box/bootstrap.result +++ b/test/box/bootstrap.result @@ -1,4 +1,4 @@ -dofile("<builddir>/extra/schema_erase.lua") +dofile("<sourcedir>/extra/schema_erase.lua") --- ... box.space._schema:select{} @@ -29,7 +29,7 @@ box.space._priv:select{} --- - [] ... -dofile("<builddir>/extra/schema_fill.lua") +dofile("<sourcedir>/extra/schema_fill.lua") --- ... box.snapshot() diff --git a/test/box/bootstrap.test.py b/test/box/bootstrap.test.py index ada352dbf07e64875443de5f4da5dc61434e8969..3f4e557cc8a61093dc34176f40ed8e813e32199e 100644 --- a/test/box/bootstrap.test.py +++ b/test/box/bootstrap.test.py @@ -7,9 +7,9 @@ sys.stdout.push_filter(server_uuid, '<server uuid>') cluster_uuid = yaml.load(server.admin('box.space._schema:get("cluster")', silent = True))[0][1] sys.stdout.push_filter(cluster_uuid, '<cluster uuid>') -sys.stdout.push_filter(server.builddir, '<builddir>') +sys.stdout.push_filter(server.sourcedir, '<sourcedir>') -server.admin('dofile("%s/extra/schema_erase.lua")' % server.builddir) +server.admin('dofile("%s/extra/schema_erase.lua")' % server.sourcedir) server.admin('box.space._schema:select{}') server.admin('box.space._cluster:select{}') server.admin('box.space._space:select{}') @@ -18,7 +18,7 @@ server.admin('box.space._user:select{}') server.admin('box.space._func:select{}') server.admin('box.space._priv:select{}') -server.admin('dofile("%s/extra/schema_fill.lua")' % server.builddir) +server.admin('dofile("%s/extra/schema_fill.lua")' % server.sourcedir) server.admin("box.snapshot()") server.restart() diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py index 2c3088616e339361d569e4660c73b942e2375d33..4bb09672945007609a4625543599df7ef6f4c8a3 100644 --- a/test/lib/tarantool_server.py +++ b/test/lib/tarantool_server.py @@ -378,6 +378,8 @@ class TarantoolServer(Server): ini.update(_ini) Server.__init__(self, ini) self.testdir = os.path.abspath(os.curdir) + self.sourcedir = os.path.abspath(os.path.join(os.path.basename( + sys.argv[0]), "..", "..")) self.re_vardir_cleanup += [ "*.snap", "*.xlog", "*.inprogress", "*.sup", "*.lua", "*.pid"]