derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Switch from the print statement to the print function.

Browse Source 
Starting with version 3, scons imposes using the print function instead
of the print statement in code it processes. To get things building
again, this change moves all python code within gem5 to use the
function version. Another change by another author separately made this
same change to the site_tools and site_init.py files.

Change-Id: I2de7dc3b1be756baad6f60574c47c8b7e80ea3b0
Reviewed-on: https://gem5-review.googlesource.com/8761
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
This commit is contained in:
Gabe Black
2018-03-05 22:05:47 -08:00
parent 10e5646dbb
commit 0bb50e6745
33 changed files with 386 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/SConscript
View File

@@ -42,6 +42,8 @@
# Kevin Lim
# Andreas Sandberg
from __future__ import print_function
from SCons.Script.SConscript import SConsEnvironment
import os
import pickle
@@ -136,7 +138,7 @@ def print_test(target, source, env):
if formatter:
formatter.dump_suites([result])
print "***** %s: %s" % (source[0].dir, status)
print("***** %s: %s" % (source[0].dir, status))
return 0
printAction = env.Action(print_test, strfunction=None)
@@ -163,19 +165,19 @@ def update_test(target, source, env):
result = result[0]
if result.skipped():
print "*** %s: %s: Test skipped, not updating." % (
source[0].dir, color_message(termcap.Yellow, "WARNING"), )
print("*** %s: %s: Test skipped, not updating." %
(source[0].dir, color_message(termcap.Yellow, "WARNING")))
return 0
elif result:
print "*** %s: %s: Test successful, not updating." % (
source[0].dir, color_message(termcap.Green, "skipped"), )
print("*** %s: %s: Test successful, not updating." %
(source[0].dir, color_message(termcap.Green, "skipped")))
return 0
elif result.failed_run():
print "*** %s: %s: Test failed, not updating." % (
source[0].dir, color_message(termcap.Red, "ERROR"), )
print("*** %s: %s: Test failed, not updating." %
(source[0].dir, color_message(termcap.Red, "ERROR")))
return 1
print "** Updating %s" % (test, )
print("** Updating %s" % test)
test.update_ref()
return 0
@@ -236,7 +238,7 @@ def list_tests(target, source, env):
with open(target[0].abspath, "w") as fout:
for cat in categories:
for test in env.Tests[cat]:
print >> fout,"/".join(test)
print("/".join(test), file=fout)
return 0