From 99f7bb183ba8c37bc8cf5643d77204c1c295c943 Mon Sep 17 00:00:00 2001
From: esha <shadrin.e@gmail.com>
Date: Wed, 25 Jun 2014 19:28:10 +0400
Subject: [PATCH] Gdb fix for run with scripts
---
test/lib/tarantool_server.py | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py
index f667be6d6e..8c27d43091 100644
--- a/test/lib/tarantool_server.py
+++ b/test/lib/tarantool_server.py
@@ -151,9 +151,10 @@ class Mixin(object):
class ValgrindMixin(Mixin):
default_valgr = {
- "logfile": "valgrind.log",
- "suppress_path": "share/",
- "suppress_name": "tarantool.sup"}
+ "logfile": "valgrind.log",
+ "suppress_path": "share/",
+ "suppress_name": "tarantool.sup"
+ }
@property
def valgrind_log(self):
@@ -188,7 +189,8 @@ class ValgrindMixin(Mixin):
class GdbMixin(Mixin):
default_gdb = {
- "name": "tarantool-gdb"}
+ "name": "tarantool-gdb"
+ }
def start_and_exit(self):
if re.search(r'^/', self._admin.port):
@@ -207,8 +209,8 @@ class GdbMixin(Mixin):
color_stdout('You started the server in gdb mode.\n', schema='info')
color_stdout('To attach, use `screen -r tarantool-gdb`\n', schema='info')
return shlex.split("screen -dmS {0} gdb {1} -ex \
- \'b main\' -ex \'run >> {2} 2>> {2}\'".format(self.default_gdb['name'],
- self.script_dst if self.script else self.binary,
+ \'b main\' -ex \'run {2} >> {3} 2>> {3}\'".format(self.default_gdb['name'],
+ self.binary, self.script_dst if self.script else '',
self.logfile))
def wait_stop(self):
@@ -217,10 +219,11 @@ class GdbMixin(Mixin):
class TarantoolServer(Server):
default_tarantool = {
- "bin": "tarantool",
- "logfile": "tarantool.log",
- "pidfile": "tarantool.pid",
- "name": "default"}
+ "bin": "tarantool",
+ "logfile": "tarantool.log",
+ "pidfile": "tarantool.pid",
+ "name": "default"
+ }
#----------------------------------PROPERTIES----------------------------------#
@property
def debug(self):
--
GitLab