Author: Lars Wassermann <lars.wasserm...@gmail.com>
Branch:
Changeset: r352:9b6429ace28b
Date: 2013-04-30 09:42 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/9b6429ace28b/
Log: added headless option to cog-calls in (vain) hope to succeed running
on CI
diff --git a/benchmarks.py b/benchmarks.py
--- a/benchmarks.py
+++ b/benchmarks.py
@@ -16,7 +16,9 @@
executables = ["targetimageloadingsmalltalk-c", "coglinux/squeak"]
# Arguments (inserted between executable and benchmark)
-executable_arguments = [["images/%s.image" % SqueakImage, '-m',
'runSPyBenchmarks'], ["images/%s.image" % SqueakImage, '../benchmarks.st']]
+executable_arguments = [
+ ["images/%s.image" % SqueakImage, '-m', 'runSPyBenchmarks'],
+ ['-vm-display-X11', '-headless', "images/%s.image" % SqueakImage,
'../benchmarks.st']]
def build_data(executable, benchmark, result):
# Mandatory fields
@@ -110,12 +112,14 @@
pass
raise Exception("commitid not found. not a git or hg repo")
-COMMIT_ID = get_commitid()
+COMMIT_ID = None
def add(executable, benchmark, result):
print "Saving result %s for executable %s, benchmark %s" % (
result, executable, benchmark)
+ if COMMIT_ID is None:
+ COMMIT_ID = get_commitid()
data = build_data(executable, benchmark, result)
params = urllib.urlencode(data)
response = "None"
@@ -135,7 +139,7 @@
with open('update.st', 'w') as f:
f.write('''Smalltalk snapshot: true andQuit: true.''')
pipe = subprocess.Popen(
- ['coglinux/squeak%s images/%s ../update.st' % (suffix, SqueakImage)],
+ ['coglinux/squeak%s -vm-display-X11 -headless images/%s ../update.st'
% (suffix, SqueakImage)],
shell=True)
pipe.wait()
os.remove('update.st')
@@ -153,8 +157,8 @@
)
out, err = pipe.communicate()
errcode = pipe.wait()
+ print out
benchmarks = out.split('\n')
- print out
for s in benchmarks:
if ';' in s:
name, time = s.split(';')
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
