Rev 52: Set a default LANG for all slaves. in file:///home/vila/buildbot/bzr/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Aug 14 14:01:14 BST 2009
At file:///home/vila/buildbot/bzr/
------------------------------------------------------------
revno: 52
revision-id: v.ladeuil+lp at free.fr-20090814130114-tneyake2ovik1cg6
parent: v.ladeuil+lp at free.fr-20090813125156-x168gh0wwndz3dnq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr
timestamp: Fri 2009-08-14 15:01:14 +0200
message:
Set a default LANG for all slaves.
* slaves/w2003x64/Makefile:
Set LANG.
* slaves/tiger/Makefile:
Set LANG.
* slaves/leopard/Makefile:
Set LANG.
* slaves/karmic/Makefile:
Set LANG.
* slaves/jaunty/Makefile:
Set LANG.
* slaves/hardy/Makefile:
Set LANG.
* master/master.cfg:
Mention that LANG is set by the slaves.
-------------- next part --------------
=== modified file 'master/master.cfg'
--- a/master/master.cfg 2009-08-13 08:14:37 +0000
+++ b/master/master.cfg 2009-08-14 13:01:14 +0000
@@ -141,6 +141,7 @@
timeout=3600, # Keep room for initial checkout when needed
))
tests_factory.addStep(BzrBuildExtensions())
+# We don't specify LANG here, each slave has its own default value
tests_factory.addStep(BzrSelftest())
# Until we better control what plugins are taken into account (which mean not
# only defining a slave specific .bazaar/plugins directory but also being able
@@ -149,7 +150,7 @@
tests_factory.addStep(BzrSelftest(
description=['running selftest no locale',],
descriptionDone=['selftest no locale'],
- env=dict(LC_TYPE='', LANG='C', LC_ALL=''),
+ env=dict(LC_TYPE='', LC_ALL='', LANG='C'),
))
# Builders for running the non-regression tests
=== modified file 'slaves/hardy/Makefile'
--- a/slaves/hardy/Makefile 2009-07-15 08:02:43 +0000
+++ b/slaves/hardy/Makefile 2009-08-14 13:01:14 +0000
@@ -2,6 +2,9 @@
# Set the environment
+# Default LANG, some builds may override for specific tests
+export LANG=en_US.UTF-8
+
# /bin for kill
# /usr/bin for bzr, make, python, tail, twistd
# ${HOME}/bin for slave specific versions
@@ -10,7 +13,6 @@
# (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-07-15 07:59:15 +0000
+++ b/slaves/jaunty/Makefile 2009-08-14 13:01:14 +0000
@@ -2,6 +2,9 @@
# Set the environment
+# Default LANG, some builds may override for specific tests
+export LANG=en_US.UTF-8
+
# ${HOME}/bin for slave specific versions
# /bin for kill
# /usr/bin for bzr, make, python, tail, twistd
=== modified file 'slaves/karmic/Makefile'
--- a/slaves/karmic/Makefile 2009-08-10 16:49:12 +0000
+++ b/slaves/karmic/Makefile 2009-08-14 13:01:14 +0000
@@ -2,6 +2,9 @@
# Set the environment
+# Default LANG, some builds may override for specific tests
+export LANG=en_US.UTF-8
+
# ${HOME}/bin for slave specific versions
# /bin for kill
# /usr/bin for bzr, make, python, tail, twistd
=== modified file 'slaves/leopard/Makefile'
--- a/slaves/leopard/Makefile 2009-07-15 08:17:16 +0000
+++ b/slaves/leopard/Makefile 2009-08-14 13:01:14 +0000
@@ -1,5 +1,10 @@
# -*- makefile -*-
+# Set the environment
+
+# Default LANG, some builds may override for specific tests
+export LANG=en_US.UTF-8
+
# ${HOME}/bin for slave specific versions
# /usr/local/bin for python2.6
# /usr/bin for make
=== modified file 'slaves/tiger/Makefile'
--- a/slaves/tiger/Makefile 2009-07-15 08:17:16 +0000
+++ b/slaves/tiger/Makefile 2009-08-14 13:01:14 +0000
@@ -2,6 +2,9 @@
# Set the environment
+# Default LANG, some builds may override for specific tests
+export LANG=en_US.UTF-8
+
# ${HOME}/bin for slave specific versions
# /usr/local/bin for python2.5
# /usr/bin for make
=== modified file 'slaves/w2003x64/Makefile'
--- a/slaves/w2003x64/Makefile 2009-08-09 16:37:26 +0000
+++ b/slaves/w2003x64/Makefile 2009-08-14 13:01:14 +0000
@@ -2,6 +2,10 @@
# Set the environment
+# Default LANG, some builds may override for specific tests
+# FIXME: Is that correct for windows ? -- vila20090814
+export LANG=en_US.UTF-8
+
# Some parts are suspicious below and should be removed if
# possible (inno setup, pyqt for example)
# C:\Python25\Scripts for twistd
More information about the bazaar-commits
mailing list