diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-12-16 10:54:08 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-12-16 10:54:08 -0330 |
| commit | bd7aed8e7c62be788e27c64ec762fedd2368d418 (patch) | |
| tree | 76ec02039d31aae6e2c309a245a4b3f062a32ce9 | |
| parent | Updated build instructions for mcpp on Solaris (diff) | |
| download | ice-bd7aed8e7c62be788e27c64ec762fedd2368d418.tar.bz2 ice-bd7aed8e7c62be788e27c64ec762fedd2368d418.tar.xz ice-bd7aed8e7c62be788e27c64ec762fedd2368d418.zip | |
http://bugzilla/bugzilla/show_bug.cgi?id=4483 - replace \n with newlines in TIMEOUT error.
| -rwxr-xr-x | scripts/Expect.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/Expect.py b/scripts/Expect.py index 1b488d5d486..8d9d5213d2f 100755 --- a/scripts/Expect.py +++ b/scripts/Expect.py @@ -47,7 +47,7 @@ class TIMEOUT: def __str__(self): return str(self.value) -def escape(s): +def escape(s, escapeNewlines = True): if s == TIMEOUT: return "<TIMEOUT>" o = StringIO.StringIO() @@ -63,7 +63,10 @@ def escape(s): elif c == '\f': o.write('\\f') elif c == '\n': - o.write('\\n') + if escapeNewlines: + o.write('\\n') + else: + o.write('\n') elif c == '\r': o.write('\\r') elif c == '\t': @@ -233,8 +236,8 @@ class reader(threading.Thread): self.logfile.write('%s: match failed.\npattern: "%s"\nbuffer: "%s"\n"' % (self.desc, escape(s), escape(buf))) self.logfile.flush() - raise TIMEOUT ('timeout exceeded in match\npattern: "%s"\nbuffer: "%s"\n"' % - (escape(s), escape(buf))) + raise TIMEOUT ('timeout exceeded in match\npattern: "%s"\nbuffer: "%s"\n' % + (escape(s), escape(buf, False))) except TIMEOUT, e: if (TIMEOUT, None) in pattern: return buf, buf, TIMEOUT, None, pattern.index((TIMEOUT, None)) |