From 5017708e1460452fc036529240b428f9ac093d9a Mon Sep 17 00:00:00 2001
From: Eugine Blikh <bigbes@gmail.com>
Date: Tue, 9 Jul 2013 18:50:14 +0400
Subject: [PATCH] Fix bugs: 1) Remove debug output 2) Add --gdb description 3)
 Return [self.binary]

---
 test/lib/server.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/lib/server.py b/test/lib/server.py
index 0dff9c9559..a7a8ccca3f 100644
--- a/test/lib/server.py
+++ b/test/lib/server.py
@@ -182,15 +182,19 @@ class Server(object):
 
         if self.gdb:
             args = prepare_gdb(self.binary, args)
+            print "You've start server in --gdb mode."
+            print "To attach, use `screen -r tnt-gdb`"
         elif self.valgrind:
-            args = prepare_valgrind(args, self.valgrind_log,
+            args = prepare_valgrind([self.binary] + args, self.valgrind_log,
                                     os.path.abspath(os.path.join(self.vardir,
                                     self.default_suppression_name)))
+        else:
+            args = [self.binary] + args
 
         if self.start_and_exit:
             self._start_and_exit(args)
             return
-        print args
+
         self.process = subprocess.Popen(args, cwd = self.vardir)
 
         # wait until the server is connected
-- 
GitLab