diff options
authorStephen Warren <>2016-07-06 10:34:30 -0600
committerTom Rini <>2016-07-08 17:16:42 -0400
commit085e64dd421caeff6ebcdef867e67b99b0942659 (patch)
parent0de02de76833cf3adcc0ba2e43cff52e6e18b63f (diff)
test/py: strip VT100 codes from match buffer
Prior to this patch, any VT100 codes emitted by U-Boot are considered part of a command's output, which often causes tests to fail. For example, test_env_echo_exists executes printenv, and then considers any text on a line before an = sign as a valid U-Boot environment variable name. This includes any VT100 codes emitted. When the test later attempts to use that variable, the name would be invalid since it includes the VT100 codes. Solve this by stripping VT100 codes from the match buffer, so they are never seen by higher level test code. The codes are still logged unmodified, so that users can expect U-Boot's exact output without interference. This does clutter the log file a bit. However, it allows users to see exactly what U-Boot emitted rather than a modified version, which hopefully is better for debugging. It's also much simpler to implement, since logging happens as soon as text is received, and so stripping the VT100 codes from the log would require handling reception and stripping of partial VT100 codes. Signed-off-by: Stephen Warren <>
1 files changed, 9 insertions, 0 deletions
diff --git a/test/py/ b/test/py/
index a5f4a8e91b..d15517389e 100644
--- a/test/py/
+++ b/test/py/
@@ -38,6 +38,11 @@ class Spawn(object):
self.before = ''
self.after = ''
self.timeout = None
+ #
+ # Note that re.I doesn't seem to work with this regex (or perhaps the
+ # version of Python in Ubuntu 14.04), hence the inclusion of a-z inside
+ # [] instead.
+ self.re_vt100 = re.compile('(\x1b\[|\x9b)[^@-_a-z]*[@-_a-z]|\x1b[@-_a-z]')
(, self.fd) = pty.fork()
if == 0:
@@ -168,6 +173,10 @@ class Spawn(object):
if self.logfile_read:
self.buf += c
+ # count=0 is supposed to be the default, which indicates
+ # unlimited substitutions, but in practice the version of
+ # Python in Ubuntu 14.04 appears to default to count=2!
+ self.buf = self.re_vt100.sub('', self.buf, count=1000000)
if self.logfile_read:
OpenPOWER on IntegriCloud