From f83de196a28f9662db06fc501f81143f1b93ba9f Mon Sep 17 00:00:00 2001
From: bigbes <bigbes@gmail.com>
Date: Fri, 6 Dec 2013 15:52:47 +0400
Subject: [PATCH] Fix for travis ci and outofsource build
---
test/lib/tarantool_server.py | 2 +-
test/lib/test_suite.py | 4 ++--
test/lib/unittest_server.py | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py
index 5ae0eb9f10..b2fecee698 100644
--- a/test/lib/tarantool_server.py
+++ b/test/lib/tarantool_server.py
@@ -27,7 +27,7 @@ class FuncTest(Test):
self.skip_cond = name.replace(".test", ".skipcond")
self.tmp_result = os.path.join(self.args.vardir,
os.path.basename(self.result))
- self.reject = "{0}/test/{1}".format(self.args.builddir,
+ self.reject = os.path.join(os.path.abspath(os.curdir),
name.replace(".test", ".reject"))
def execute(self, server):
diff --git a/test/lib/test_suite.py b/test/lib/test_suite.py
index 7c23439f63..89f6266afe 100644
--- a/test/lib/test_suite.py
+++ b/test/lib/test_suite.py
@@ -88,8 +88,8 @@ class Test:
self.skip_cond = name.replace(".test", ".skipcond")
self.tmp_result = os.path.join(self.args.vardir,
os.path.basename(self.result))
- self.reject = "{0}/test/{1}".format(self.args.builddir,
- name.replace(".test", ".reject"))
+ self.reject = os.path.join(os.path.abspath(os.curdir),
+ name.replace(".test", ".reject"))
self.is_executed = False
self.is_executed_ok = None
self.is_equal_result = None
diff --git a/test/lib/unittest_server.py b/test/lib/unittest_server.py
index 24ec2597d1..4b9db8c3bc 100644
--- a/test/lib/unittest_server.py
+++ b/test/lib/unittest_server.py
@@ -20,7 +20,8 @@ class UnitTest(Test):
self.skip_cond = name + ".skipcond"
self.tmp_result = os.path.join(self.args.vardir,
os.path.basename(self.result))
- self.reject = "{0}/test/{1}".format(self.args.builddir, name + ".reject")
+ self.reject = os.path.join(os.path.abspath(os.curdir),
+ name.replace(".test", ".reject"))
def execute(self, server):
diagnostics = "unknown"
--
GitLab