Rev 69: Test core plugins only, test C without extensions. in file:///home/vila/buildbot/bzr/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Sat Sep 12 09:56:00 BST 2009
At file:///home/vila/buildbot/bzr/
------------------------------------------------------------
revno: 69
revision-id: v.ladeuil+lp at free.fr-20090912085600-1mnvu21fjc38blh8
parent: v.ladeuil+lp at free.fr-20090912102237-vx2gkk7k0u7bpul8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr
timestamp: Sat 2009-09-12 10:56:00 +0200
message:
Test core plugins only, test C without extensions.
* slaves/slave.mk:
Factor out slave common setup.
* master/master.cfg:
(BzrSelftest): Plugins selection is now configured by the
slave. \o/
(BzrRemoveExtensions): New step to prepare testing without
extensions.
(tests_factory): Add test without extensions.
* TODO:
Cleanup a bit.
-------------- next part --------------
=== modified file 'TODO'
--- a/TODO 2009-08-31 12:24:20 +0000
+++ b/TODO 2009-09-12 08:56:00 +0000
@@ -9,9 +9,8 @@
More or less supported in buildbot, needs testing.
* add more slaves
- xBSD
redhat/centos/fedora
- gentoo
+ {Open|Net}BSD
* add builders for
PPAs
=== modified file 'master/master.cfg'
--- a/master/master.cfg 2009-09-08 12:55:47 +0000
+++ b/master/master.cfg 2009-09-12 08:56:00 +0000
@@ -128,6 +128,15 @@
command = ['make']
+class BzrRemoveExtensions(shell.ShellCommand):
+
+ name = 'Extensions cleanup'
+ haltOnFailure = 1
+ description = ['removing C extensions']
+ descriptionDone = ['C extensions']
+ command = ['make', 'clean']
+
+
class BzrTests(shell.ShellCommand):
name = 'Non-regression tests'
@@ -147,8 +156,6 @@
description = ['running selftest']
descriptionDone = ['selftest']
command = ['python', './bzr', 'selftest',
- # FIXME: we need a better way to define which plugins are tested
- '--no-plugins',
'--parallel=fork',
'-v',
]
@@ -169,6 +176,11 @@
descriptionDone=['selftest no locale'],
env=dict(LC_TYPE='', LC_ALL='', LANG='C'),
))
+# Check that bzr can be used with purepython only: without any C extension
+tests_factory.addStep(BzrRemoveExtensions())
+# We resort to default LANG here
+tests_factory.addStep(BzrSelftest())
+
# Builders for running the non-regression tests
=== modified file 'slaves/freebsd/Makefile'
--- a/slaves/freebsd/Makefile 2009-09-06 02:07:21 +0000
+++ b/slaves/freebsd/Makefile 2009-09-12 08:56:00 +0000
@@ -1,21 +1,12 @@
# -*- makefile -*-
-# Set the environment
-
-# Make sure we have some output by default for long operations
-export BZR_PROGRESS_BAR=text
-
-# Default LANG, some builds may override for specific tests
-export LANG=en_US.UTF-8
+include ../slave.mk
# ${HOME}/bin for slave specific versions
# /bin for kill
# /usr/local/bin for bzr, python, twistd
# /usr/bin for make, tail
export PATH=${HOME}/bin:/bin:/usr/bin:/usr/local/bin
-# ${HOME}/lib/python for slave specific versions
-# (including testtools and subunit for selftest --parallel=fork)
-export PYTHONPATH=${HOME}/lib/python
start:
twistd --no_save -y buildbot.tac
=== modified file 'slaves/gentoo/Makefile'
--- a/slaves/gentoo/Makefile 2009-09-12 10:22:37 +0000
+++ b/slaves/gentoo/Makefile 2009-09-12 08:56:00 +0000
@@ -1,20 +1,11 @@
# -*- makefile -*-
-# Set the environment
-
-# Make sure we have some output by default for long operations
-export BZR_PROGRESS_BAR=text
-
-# Default LANG, some builds may override for specific tests
-export LANG=en_US.UTF-8
+include ../slave.mk
# ${HOME}/bin for slave specific versions
# /bin for kill
# /usr/bin for bzr, make, python, tail, twistd
export PATH=${HOME}/bin:/bin:/usr/bin
-# ${HOME}/lib/python for slave specific versions
-# (including testtools and subunit for selftest --parallel=fork)
-export PYTHONPATH=${HOME}/lib/python
start:
twistd --no_save -y buildbot.tac
=== modified file 'slaves/hardy/Makefile'
--- a/slaves/hardy/Makefile 2009-08-31 12:24:20 +0000
+++ b/slaves/hardy/Makefile 2009-09-12 08:56:00 +0000
@@ -1,20 +1,11 @@
# -*- makefile -*-
-# Set the environment
-
-# Make sure we have some output by default for long operations
-export BZR_PROGRESS_BAR=text
-
-# Default LANG, some builds may override for specific tests
-export LANG=en_US.UTF-8
+include ../slave.mk
# /bin for kill
# /usr/bin for bzr, make, python, tail, twistd
# ${HOME}/bin for slave specific versions
export PATH=/bin:/usr/bin
-# ${HOME}/lib/python for slave specific versions
-# (including testtools and subunit for selftest --parallel=fork)
-export PYTHONPATH=${HOME}/lib/python
start:
twistd --no_save -y buildbot.tac
=== modified file 'slaves/jaunty/Makefile'
--- a/slaves/jaunty/Makefile 2009-08-31 12:24:20 +0000
+++ b/slaves/jaunty/Makefile 2009-09-12 08:56:00 +0000
@@ -1,12 +1,6 @@
# -*- makefile -*-
-# Set the environment
-
-# Make sure we have some output by default for long operations
-export BZR_PROGRESS_BAR=text
-
-# Default LANG, some builds may override for specific tests
-export LANG=en_US.UTF-8
+include ../slave.mk
# ${HOME}/bin for slave specific versions
# /bin for kill
=== modified file 'slaves/karmic/Makefile'
--- a/slaves/karmic/Makefile 2009-08-31 12:24:20 +0000
+++ b/slaves/karmic/Makefile 2009-09-12 08:56:00 +0000
@@ -1,20 +1,11 @@
# -*- makefile -*-
-# Set the environment
-
-# Make sure we have some output by default for long operations
-export BZR_PROGRESS_BAR=text
-
-# Default LANG, some builds may override for specific tests
-export LANG=en_US.UTF-8
+include ../slave.mk
# ${HOME}/bin for slave specific versions
# /bin for kill
# /usr/bin for bzr, make, python, tail, twistd
export PATH=${HOME}/bin:/bin:/usr/bin
-# ${HOME}/lib/python for slave specific versions
-# (including testtools and subunit for selftest --parallel=fork)
-export PYTHONPATH=${HOME}/lib/python
start:
twistd --no_save -y buildbot.tac
=== modified file 'slaves/leopard/Makefile'
--- a/slaves/leopard/Makefile 2009-08-31 12:24:20 +0000
+++ b/slaves/leopard/Makefile 2009-09-12 08:56:00 +0000
@@ -1,12 +1,6 @@
# -*- makefile -*-
-# Set the environment
-
-# Make sure we have some output by default for long operations
-export BZR_PROGRESS_BAR=text
-
-# Default LANG, some builds may override for specific tests
-export LANG=en_US.UTF-8
+include ../slave.mk
# ${HOME}/bin for slave specific versions
# /usr/local/bin for python2.6
@@ -14,9 +8,6 @@
# /usr/sbin for sysctl (for selftest --parallel=fork)
# /bin for cat
export PATH:=${HOME}/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin
-# ${HOME}/lib/python for slave specific versions
-# (including testtools and subunit for selftest --parallel=fork)
-export PYTHONPATH:=${HOME}/lib/python
start:
twistd --no_save -y buildbot.tac
=== added file 'slaves/slave.mk'
--- a/slaves/slave.mk 1970-01-01 00:00:00 +0000
+++ b/slaves/slave.mk 2009-09-12 08:56:00 +0000
@@ -0,0 +1,18 @@
+# -*- makefile -*-
+
+# Set the environment common to all slaves. This is included in
+# all slaves Makefile and can be overriden there if needed.
+
+# Make sure we have some output by default for long operations
+export BZR_PROGRESS_BAR=text
+
+# We want to keep the core plugins only
+BZR_PLUGIN_PATH='-user:-site'
+
+# Default LANG, some builds may override for specific tests
+export LANG=en_US.UTF-8
+
+# ${HOME}/lib/python for slave specific versions
+# (including testtools and subunit for selftest --parallel=fork)
+export PYTHONPATH=${HOME}/lib/python
+
=== modified file 'slaves/tiger/Makefile'
--- a/slaves/tiger/Makefile 2009-08-31 12:24:20 +0000
+++ b/slaves/tiger/Makefile 2009-09-12 08:56:00 +0000
@@ -1,12 +1,6 @@
# -*- makefile -*-
-# Set the environment
-
-# Make sure we have some output by default for long operations
-export BZR_PROGRESS_BAR=text
-
-# Default LANG, some builds may override for specific tests
-export LANG=en_US.UTF-8
+include ../slave.mk
# ${HOME}/bin for slave specific versions
# /usr/local/bin for python2.5
@@ -14,11 +8,9 @@
# /usr/sbin for sysctl (used for --parallel=fork)
# /bin for cat
export PATH:=${HOME}/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin
-# ${HOME}/lib/python for slave specific versions
-# (including testtools and subunit for selftest --parallel=fork)
# ${HOME}/lib/python2.5/site-packages for buildbot
# /Library/Python/2.5/site-packages for twisted
-export PYTHONPATH:=${HOME}/lib/python:${HOME}/lib/python2.5/site-packages:/Library/Python/2.5/site-packages
+export PYTHONPATH:=${PYTHONPATH}:${HOME}/lib/python2.5/site-packages:/Library/Python/2.5/site-packages
start:
twistd --no_save -y buildbot.tac
More information about the bazaar-commits
mailing list