test: use print() function on both Python 2 and 3

cclauss · rvagg · commit 957ecbe019c5 · 2018-11-28T11:25:28.000+11:00
PR-URL: #24485 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
diff --git a/test/message/testcfg.py b/test/message/testcfg.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -67,22 +68,22 @@ def IsFailureOutput(self, output):
 raw_lines = (output.stdout + output.stderr).split('\n')
 outlines = [ s for s in raw_lines if not self.IgnoreLine(s) ]
 if len(outlines) != len(patterns):
- print "length differs."
- print "expect=%d" % len(patterns)
- print "actual=%d" % len(outlines)
- print "patterns:"
+ print("length differs.")
+ print("expect=%d" % len(patterns))
+ print("actual=%d" % len(outlines))
+ print("patterns:")
 for i in xrange(len(patterns)):
- print "pattern = %s" % patterns[i]
- print "outlines:"
+ print("pattern = %s" % patterns[i])
+ print("outlines:")
 for i in xrange(len(outlines)):
- print "outline = %s" % outlines[i]
+ print("outline = %s" % outlines[i])
 return True
 for i in xrange(len(patterns)):
 if not re.match(patterns[i], outlines[i]):
- print "match failed"
- print "line=%d" % i
- print "expect=%s" % patterns[i]
- print "actual=%s" % outlines[i]
+ print("match failed")
+ print("line=%d" % i)
+ print("expect=%s" % patterns[i])
+ print("actual=%s" % outlines[i])
 return True
 return False
 
diff --git a/test/pseudo-tty/testcfg.py b/test/pseudo-tty/testcfg.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -65,22 +66,22 @@ def IsFailureOutput(self, output):
 raw_lines = (output.stdout + output.stderr).split('\n')
 outlines = [ s.strip() for s in raw_lines if not self.IgnoreLine(s) ]
 if len(outlines) != len(patterns):
- print "length differs."
- print "expect=%d" % len(patterns)
- print "actual=%d" % len(outlines)
- print "patterns:"
+ print("length differs.")
+ print("expect=%d" % len(patterns))
+ print("actual=%d" % len(outlines))
+ print("patterns:")
 for i in xrange(len(patterns)):
- print "pattern = %s" % patterns[i]
- print "outlines:"
+ print("pattern = %s" % patterns[i])
+ print("outlines:")
 for i in xrange(len(outlines)):
- print "outline = %s" % outlines[i]
+ print("outline = %s" % outlines[i])
 return True
 for i in xrange(len(patterns)):
 if not re.match(patterns[i], outlines[i]):
- print "match failed"
- print "line=%d" % i
- print "expect=%s" % patterns[i]
- print "actual=%s" % outlines[i]
+ print("match failed")
+ print("line=%d" % i)
+ print("expect=%s" % patterns[i])
+ print("actual=%s" % outlines[i])
 return True
 return False
 

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 +from __future__ importprint_function
 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 raw_lines= (output.stdout+output.stderr).split('\n')
 outlines= [ sforsinraw_linesifnotself.IgnoreLine(s) ]
 iflen(outlines) !=len(patterns):
 -print"length differs."
 -print"expect=%d"%len(patterns)
 -print"actual=%d"%len(outlines)
 -print"patterns:"
 +print("length differs.")
 +print("expect=%d"%len(patterns))
 +print("actual=%d"%len(outlines))
 +print("patterns:")
 foriinxrange(len(patterns)):
 -print"pattern = %s"%patterns[i]
 -print"outlines:"
 +print("pattern = %s"%patterns[i])
 +print("outlines:")
 foriinxrange(len(outlines)):
 -print"outline = %s"%outlines[i]
 +print("outline = %s"%outlines[i])
 returnTrue
 foriinxrange(len(patterns)):
 ifnotre.match(patterns[i], outlines[i]):
 -print"match failed"
 -print"line=%d"%i
 -print"expect=%s"%patterns[i]
 -print"actual=%s"%outlines[i]
 +print("match failed")
 +print("line=%d"%i)
 +print("expect=%s"%patterns[i])
 +print("actual=%s"%outlines[i])
 returnTrue
 returnFalse