From 19d6a4c01f2dcbc9fd537b1303d6fc136583e7b1 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Tue, 24 Feb 2015 14:42:17 +0300
Subject: [PATCH] Fix #722: box/bootstrap.test.py is broken in out-of-source
builds
---
test/box/bootstrap.result | 4 ++--
test/box/bootstrap.test.py | 6 +++---
test/lib/tarantool_server.py | 2 ++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/test/box/bootstrap.result b/test/box/bootstrap.result
index f055177023..1faa074422 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 ada352dbf0..3f4e557cc8 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 2c3088616e..4bb0967294 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"]
--
GitLab