Author: David Schneider <david.schnei...@picle.org>
Branch: buildbot-0.8.7
Changeset: r832:d2fce15a6351
Date: 2013-08-02 11:32 +0200
http://bitbucket.org/pypy/buildbot/changeset/d2fce15a6351/
Log: merge default
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
@@ -56,7 +56,8 @@
+ crosstranslationjitargs),
platform='linux-armhf-raring',
interpreter='pypy',
- prefix=['schroot', '-c', 'raring'])
+ prefix=['schroot', '-c', 'raring'],
+ trigger='JITLINUXARMHF_RARING_scheduler')
pypyARMJITTranslatedTestFactory = pypybuilds.TranslatedTests(
translationArgs=(crosstranslationargs
@@ -89,6 +90,15 @@
app_tests=True,
platform='linux-armhf-raspbian',
)
+pypyARMHF_RARING_JITTranslatedTestFactory = pypybuilds.TranslatedTests(
+ translationArgs=(crosstranslationargs
+ + jit_translation_args
+ + crosstranslationjitargs),
+ lib_python=True,
+ pypyjit=True,
+ app_tests=True,
+ platform='linux-armhf-raring',
+ )
#
APPLVLLINUXARM = "pypy-c-app-level-linux-armel"
APPLVLLINUXARMHF_v7 = "pypy-c-app-level-linux-armhf-v7"
@@ -97,6 +107,7 @@
JITLINUXARM = "pypy-c-jit-linux-armel"
JITLINUXARMHF_v7 = "pypy-c-jit-linux-armhf-v7"
JITLINUXARMHF_RASPBIAN = "pypy-c-jit-linux-armhf-raspbian"
+JITLINUXARMHF_RARING = "pypy-c-jit-linux-armhf-raring"
JITBACKENDONLYLINUXARMEL = "jitbackendonly-own-linux-armel"
JITBACKENDONLYLINUXARMHF = "jitbackendonly-own-linux-armhf"
@@ -155,6 +166,10 @@
JITLINUXARMHF_RASPBIAN, # triggered by
BUILDJITLINUXARMHF_RASPBIAN
JITLINUXARMHF_v7, # triggered by
BUILDJITLINUXARMHF_RASPBIAN, on cubieboard-bob
]),
+
+ Triggerable("JITLINUXARMHF_RARING_scheduler", [
+ JITLINUXARMHF_RARING, # triggered by BUILDJITLINUXARMHF_RARING
+ ])
]
builders = [
@@ -231,6 +246,12 @@
'category': 'linux-armhf',
"locks": [ARMBoardLock.access('counting')],
},
+ {"name": JITLINUXARMHF_RARING,
+ "slavenames": ["greenbox3-node0"],
+ 'builddir': JITLINUXARMHF_RARING,
+ 'factory': pypyARMHF_RARING_JITTranslatedTestFactory,
+ 'category': 'linux-armhf',
+ },
# Translation Builders for ARM
{"name": BUILDLINUXARM,
"slavenames": ['hhu-cross-armel'],
diff --git a/bot2/pypybuildbot/summary.py b/bot2/pypybuildbot/summary.py
--- a/bot2/pypybuildbot/summary.py
+++ b/bot2/pypybuildbot/summary.py
@@ -179,14 +179,14 @@
run_info = {'URL': run_url, 'elapsed': pytest_elapsed or None,
'times': build.getTimes()}
outcome_set = RevisionOutcomeSet(rev, key, run_info)
- someresult = False
- # "*-run" categories mean the build is not a test build!
- if builderStatus.category:
- someresult = builderStatus.category.endswith("-run")
+ #someresult = False
+ ## "*-run" categories mean the build is not a test build!
+ #if builderStatus.category:
+ # someresult = builderStatus.category.endswith("-run")
if pytest_logs:
for stepName, resultLog in pytest_logs:
if resultLog.hasContents():
- someresult = True
+ #someresult = True
outcome_set.populate(resultLog)
failedtests = not not outcome_set.failed
@@ -201,11 +201,12 @@
failure = text
break
- if not someresult or failure is not None:
- if failure:
- name = '"%s"' % failure # quote
- else:
- name = '<run>'
+ #if not someresult or failure is not None:
+ if failure is not None:
+ #if failure:
+ name = '"%s"' % failure # quote
+ #else:
+ # name = '<run>'
outcome_set.populate_one(name, '!')
return outcome_set
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
