Author: Matti Picus <[email protected]>
Branch: numpy-tests
Changeset: r830:b37fcd808249
Date: 2013-07-17 23:19 +0300
http://bitbucket.org/pypy/buildbot/changeset/b37fcd808249/

Log:    add builder to master

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -783,23 +783,30 @@
 
         self.addStep(ShellCmd(
             description="install nose",
-            command=['download/bin/pip', 'install','nose'],
+            command=['install/bin/pip', 'install','nose'],
             workdir='pypy-c'))
 
         # obtain a pypy-compatible branch of numpy
         numpy_url = 'https://github.com/mattip/numpy'
         numpy_pypy_branch = 'pypy'
-        update_git(platform, factory, numpy_url, 'numpy_src', use_branch=True,
+        update_git(platform, self, numpy_url, 'numpy_src', use_branch=True,
               force_branch=numpy_pypy_branch)
 
+        if os.path.exists('pypy_c/download/lib_pypy/numpy.py'):
+            self.addStep(ShellCmd(
+                description="delete lib_pypy/numpy.*",
+                command=['rm', 'download/lib_pypy/numpy.*'],
+                workdir='pypy-c'))
+
+
         self.addStep(ShellCmd(
             description="install numpy",
-            command=['download/bin/python', 'setup.py','install'],
+            command=['install/bin/python', 'setup.py','install'],
             workdir='numpy_src'))
 
         self.addStep(ShellCmd(
             description="test numpy",
-            command=['download/bin/python', '-c', '"import 
numpy;numpy.test()"',
+            command=['install/bin/python', '-c', '"import numpy;numpy.test()"',
                      '> pytest-numpy.log','2>&1'],
             logfiles={'pytestLog': 'pytest-numpy.log'},
             timeout=4000,
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -151,6 +151,8 @@
 pypyJITBenchmarkFactory64_tannit = pypybuilds.JITBenchmark(platform='linux64',
                                                            postfix='-64')
 
+pypyNumpyCompatability = pypybuilds.NativeNumpyTests()
+
 #
 
 LINUX32 = "own-linux-x86-32"
@@ -182,7 +184,7 @@
 JITBENCH64 = "jit-benchmark-linux-x86-64"
 JITBENCH64_2 = 'jit-benchmark-linux-x86-64-2'
 CPYTHON_64 = "cpython-2-benchmark-x86-64"
-
+NUMPY_64 = "numpy-compatability-linux-x86-64"
 
 extra_opts = {'xerxes': {'keepalive_interval': 15},
              'aurora': {'max_builds': 1},
@@ -393,6 +395,12 @@
                    'factory': pypyOwnTestFactoryIndiana,
                    'category': 'openindiana32',
                    },
+                  {'name': NUMPY_64,
+                   'slavenames': ['numpy64'],
+                   'builddir': NUMPY_64,
+                   'factory': pypyNumpyCompatability,
+                   'category': 'numpy',
+                   },
                 ] + ARM.builders,
 
     # 
http://readthedocs.org/docs/buildbot/en/latest/tour.html#debugging-with-manhole
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to