Author: Matti Picus <[email protected]>
Branch: numpy-tests
Changeset: r879:3ca416f65160
Date: 2013-11-08 15:09 +0200
http://bitbucket.org/pypy/buildbot/changeset/3ca416f65160/

Log:    move numpy compat build step from benchmark to NativeNumpyTests

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -642,20 +642,6 @@
                 locks=[lock.access('counting')],
                 )
             )
-        if host == 'tannit':
-            pypy_c_rel = 'build/pypy/goal/pypy-c'
-            self.addStep(ShellCmd(
-                env={'PYTHONPATH': './benchmarks/lib/jinja2'},
-                description="measure numpy compatibility",
-                command=[pypy_c_rel,
-                         'build/pypy/module/micronumpy/tool/numready/',
-                         pypy_c_rel, 'numpy-compat.html'],
-                workdir="."))
-            resfile = 
os.path.expanduser("~/numpy_compat/%(got_revision)s.html")
-            self.addStep(NumpyStatusUpload(
-                slavesrc="numpy-compat.html",
-                masterdest=WithProperties(resfile),
-                workdir="."))
         pypy_c_rel = "../build/pypy/goal/pypy-c"
         self.addStep(ShellCmd(
             # this step needs exclusive access to the CPU
@@ -801,6 +787,7 @@
     '''
     def __init__(self, platform='linux',
                  app_tests=False,
+                 host = 'tannit',
                  lib_python=False,
                  pypyjit=True,
                  prefix=None,
@@ -869,3 +856,16 @@
             workdir='install',
             #env={"PYTHONPATH": ['download']}, # shouldn't be needed, but what 
if it is set externally?
         ))
+        if host == 'tannit':
+            pypy_c_rel = 'install/bin/python'
+            self.addStep(ShellCmd(
+                description="measure numpy compatibility",
+                command=[pypy_c_rel,
+                         'numpy_src/tools/numready/',
+                         pypy_c_rel, 'numpy-compat.html'],
+                workdir="."))
+            resfile = 
os.path.expanduser("~/numpy_compat/%(got_revision)s.html")
+            self.addStep(NumpyStatusUpload(
+                slavesrc="numpy-compat.html",
+                masterdest=WithProperties(resfile),
+                workdir="."))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to