summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiacomo Travaglini <giacomo.travaglini@arm.com>2018-03-13 16:13:53 +0000
committerGiacomo Travaglini <giacomo.travaglini@arm.com>2018-03-14 10:34:02 +0000
commit6e63552f5058564e32899a7973ec073a460ff55d (patch)
tree96f0ec74daae7e51d14a1bdfacb04d6b4910b91f
parent74305fad328ad22fa3bf32b50ad683043494803c (diff)
downloadgem5-6e63552f5058564e32899a7973ec073a460ff55d.tar.xz
tests: Add missing print replacements in tests subdir
Some python files were still using deprecated print statement. Change-Id: I19b1fe9c28650707f01725d40c87ad0538f9c5e6 Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com> Reviewed-on: https://gem5-review.googlesource.com/9141 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
-rw-r--r--tests/configs/gpu-ruby.py4
-rw-r--r--tests/testing/results.py14
2 files changed, 11 insertions, 7 deletions
diff --git a/tests/configs/gpu-ruby.py b/tests/configs/gpu-ruby.py
index 6b20c31e8..e846dbaf6 100644
--- a/tests/configs/gpu-ruby.py
+++ b/tests/configs/gpu-ruby.py
@@ -33,6 +33,8 @@
# Author: Brad Beckmann
#
+from __future__ import print_function
+
import m5
from m5.objects import *
from m5.defines import buildEnv
@@ -77,7 +79,7 @@ def run_test(root):
# simulate until program terminates
exit_event = m5.simulate(maxtick)
- print 'Exiting @ tick', m5.curTick(), 'because', exit_event.getCause()
+ print('Exiting @ tick', m5.curTick(), 'because', exit_event.getCause())
parser = optparse.OptionParser()
Options.addCommonOptions(parser)
diff --git a/tests/testing/results.py b/tests/testing/results.py
index 387362a75..4e0707860 100644
--- a/tests/testing/results.py
+++ b/tests/testing/results.py
@@ -37,6 +37,8 @@
#
# Authors: Andreas Sandberg
+from __future__ import print_function
+
from abc import ABCMeta, abstractmethod
import inspect
import pickle
@@ -173,21 +175,21 @@ class Text(ResultFormatter):
def dump_suites(self, suites):
fout = self.fout
for suite in suites:
- print >> fout, "--- %s ---" % suite.name
+ print("--- %s ---" % suite.name, file=fout)
for t in suite.results:
- print >> fout, "*** %s" % t
+ print("*** %s" % t, file=fout)
if t and not self.verbose:
continue
if t.message:
- print >> fout, t.message
+ print(t.message, file=fout)
if t.stderr:
- print >> fout, t.stderr
+ print(t.stderr, file=fout)
if t.stdout:
- print >> fout, t.stdout
+ print(t.stdout, file=fout)
class TextSummary(ResultFormatter):
"""Output test results as a text summary"""
@@ -209,7 +211,7 @@ class TextSummary(ResultFormatter):
fout = self.fout
for suite in suites:
status = self.test_status(suite)
- print >> fout, "%s: %s" % (suite.name, status)
+ print("%s: %s" % (suite.name, status), file=fout)
class JUnit(ResultFormatter):
"""Output test results as JUnit XML"""