[pypy-commit] buildbot default: merge heads

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r854:299b69d2e736
Date: 2013-09-03 19:33 +0200
http://bitbucket.org/pypy/buildbot/changeset/299b69d2e736/

Log:	merge heads

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
@@ -100,6 +100,7 @@
     platform='linux-armhf-raring',
     )
 #
+LINUXARMHF = "own-linux-armhf"
 APPLVLLINUXARM = "pypy-c-app-level-linux-armel"
 APPLVLLINUXARMHF_v7 = "pypy-c-app-level-linux-armhf-v7"
 APPLVLLINUXARMHF_RASPBIAN = "pypy-c-app-level-linux-armhf-raspbian"
@@ -193,6 +194,12 @@
    "locks": [ARMBoardLock.access('counting')],
    },
   ## armv7
+  {"name": LINUXARMHF,
+   "slavenames": ["greenbox3-node0"],
+   "builddir": LINUXARMHF,
+   "factory": pypyOwnTestFactoryARM,
+   "category": 'linux-armhf',
+  },
   {"name": JITBACKENDONLYLINUXARMHF_v7,
    "slavenames": ['cubieboard-bob'],
    "builddir": JITBACKENDONLYLINUXARMHF_v7,