ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test framework: improve gdbserver handling

Browse Source 
Produce a user-friendly message if gdbserver is not available, instead
of cryptic exception.

Change-Id: Ia0d99e0488d2ee6e8af764b466dae2639f17ea55
Signed-off-by: Klement Sekera <ksekera@cisco.com>
This commit is contained in:
Klement Sekera
2016-11-03 05:36:01 +01:00
committed by Damjan Marion
parent bdb1f81937
commit 931be3aca2
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/framework.py
View File

@ -152,13 +152,24 @@ class VppTestCase(unittest.TestCase):
cmdline = cls.vpp_cmdline
if cls.debug_gdbserver:
cmdline = ['gdbserver', 'localhost:7777'] + cls.vpp_cmdline
gdbserver = '/usr/bin/gdbserver'
if not os.path.isfile(gdbserver) or \
not os.access(gdbserver, os.X_OK):
raise Exception("gdbserver binary '%s' does not exist or is "
"not executable" % gdbserver)
cmdline = [gdbserver, 'localhost:7777'] + cls.vpp_cmdline
cls.logger.info("Gdbserver cmdline is %s", " ".join(cmdline))
cls.vpp = subprocess.Popen(cmdline,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
bufsize=1)
try:
cls.vpp = subprocess.Popen(cmdline,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
bufsize=1)
except Exception as e:
cls.logger.critical("Couldn't start vpp: %s" % e)
raise
cls.wait_for_enter()
@classmethod
@ -209,8 +220,9 @@ class VppTestCase(unittest.TestCase):
target=pump_output, args=(cls.vpp.stderr, cls.vpp_stderr_queue))
cls.vpp_stderr_reader_thread.start()
except:
cls.vpp.terminate()
del cls.vpp
if hasattr(cls, 'vpp'):
cls.vpp.terminate()
del cls.vpp
raise
@classmethod