From 5001fae516d442f6154c35b2da4ee5423bdc2a4a Mon Sep 17 00:00:00 2001 From: Anouk Van Laer Date: Wed, 7 Mar 2018 17:34:47 +0000 Subject: [PATCH] gem5: Update to telnet connection method gem5 prints a string, to communicate which telnet port can be used to connect to the gem5 system. The exact string has recently changed. This commit ensures both the old and new string are taken into account when devlib parses gem5 output to determine the telnet port. --- devlib/platform/gem5.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/devlib/platform/gem5.py b/devlib/platform/gem5.py index f783df3..f70b980 100644 --- a/devlib/platform/gem5.py +++ b/devlib/platform/gem5.py @@ -174,7 +174,11 @@ class Gem5SimulationPlatform(Platform): # Open the stderr file with open(self.stderr_filename, 'r') as f: for line in f: + # Look for two different strings, exact wording depends on + # version of gem5 m = re.search(r"Listening for system connection on port (?P\d+)", line) + if not m: + m = re.search(r"Listening for connections on port (?P\d+)", line) if m: port = int(m.group('port')) if port >= 3456 and port < 5900: