Skip to content
Snippets Groups Projects
Commit 19d6a4c0 authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Fix #722: box/bootstrap.test.py is broken in out-of-source builds

parent 4c9524e0
No related branches found
No related tags found
No related merge requests found
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()
......
......@@ -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()
......
......@@ -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"]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment