Author: Armin Rigo <[email protected]>
Branch: 
Changeset: r868:df145500744c
Date: 2013-10-16 08:12 +0200
http://bitbucket.org/pypy/buildbot/changeset/df145500744c/

Log:    The "py.test -A" part of a pypy-c-jit build suddenly eats 20GB of
        memory on OS/X, apparently. Disabling the builder for now --- it's
        the only thing I can do.

diff --git a/bot2/pypybuildbot/arm_master.py b/bot2/pypybuildbot/arm_master.py
--- a/bot2/pypybuildbot/arm_master.py
+++ b/bot2/pypybuildbot/arm_master.py
@@ -147,6 +147,8 @@
         BUILDLINUXARM,                 # on hhu-cross-armel, uses 1 core
         BUILDLINUXARMHF_RASPBIAN,      # on hhu-cross-raspbianhf, uses 1 core
 
+        LINUXARMHF,                    # onw tests on greenbox3-node0
+
         JITBACKENDONLYLINUXARMEL,      # on hhu-imx.53
         JITBACKENDONLYLINUXARMHF,
         JITBACKENDONLYLINUXARMHF_v7,   # on cubieboard-bob
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -167,6 +167,7 @@
 JITLINUX32 = "pypy-c-jit-linux-x86-32"
 JITLINUX64 = "pypy-c-jit-linux-x86-64"
 JITMACOSX64 = "pypy-c-jit-macosx-x86-64"
+JITMACOSX64_2 = "pypy-c-jit-macosx-x86-64-2"
 JITWIN32 = "pypy-c-jit-win-x86-32"
 JITWIN64 = "pypy-c-jit-win-x86-64"
 JITFREEBSD764 = 'pypy-c-jit-freebsd-7-x86-64'
@@ -253,6 +254,7 @@
                         JITLINUX32,
                         JITLINUX64,
                         JITMACOSX64,
+                        JITMACOSX64_2,
                         JITWIN32,
                         JITWIN64,
                         JITFREEBSD764,
@@ -353,11 +355,17 @@
                    "category": 'mac32'
                   },
                   {"name" : JITMACOSX64,
-                   "slavenames": ["xerxes"],
+                   "slavenames": ["xerxes", "tosh"],
                    'builddir' : JITMACOSX64,
                    'factory' : pypyJITTranslatedTestFactoryOSX64,
                    'category' : 'mac64',
                    },
+                  {"name" : JITMACOSX64_2,
+                   "slavenames": ["xerxes", "tosh"],
+                   'builddir' : JITMACOSX64_2,
+                   'factory' : pypyJITTranslatedTestFactoryOSX64,
+                   'category' : 'mac64',
+                   },
                   {"name": WIN32,
                    "slavenames": ["aurora", "SalsaSalsa"],
                    "builddir": WIN32,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to