* oln_master.cfg: Here. --- buildbot/masters/ChangeLog | 6 ++++++ buildbot/masters/oln_master.cfg | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index 7bd12f4..119fd7e 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,3 +1,9 @@ +2010-07-21 Roland Levillain <roland@lrde.epita.fr> + + Disable the use of Magick++ on most Olena builds. + + * oln_master.cfg: Here. + 2010-05-12 Roland Levillain <roland@lrde.epita.fr> Update the menu of BuildBots' Web site. diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg index 39484bd..a4ae0c9 100644 --- a/buildbot/masters/oln_master.cfg +++ b/buildbot/masters/oln_master.cfg @@ -99,12 +99,18 @@ checkout = Git(repourl='git://git.lrde.org/olena') mybranch = "master" +# On 2010-07-21, hosts `dallas', `los-angeles' and `seattle' have a +# buggy GraphicsMagick version (1.1.11), making a test in +# milena/tests/io/magick fail with a SEGV. Hence the addition of the +# `--without-magickxx' flag to most configurations below. + f_oln_unix_gcc_4_1 = GNUBuildSystem(project_repos='olena', project_name='olena', scm_step=checkout, branch=mybranch, extra_configure_args='CXX="ccache g++-4.1" CC="ccache gcc-4.1" \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ + --without-magickxx \ --enable-all', install_cmd=None, dist_cmd=None, @@ -113,6 +119,7 @@ f_oln_unix_gcc_4_1 = GNUBuildSystem(project_repos='olena', check_cmd='make -k check', distcheck_configure_args='CCX=\'ccache g++-4.1\' CC=\'ccache gcc-4.1\' \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ + --without-magickxx \ --enable-all' ) @@ -122,6 +129,7 @@ f_oln_unix_gcc_4_1_64 = GNUBuildSystem(project_repos='olena', branch=mybranch, extra_configure_args='CXX="ccache g++-4.1" CC="ccache gcc-4.1" \ --with-gdcm=/lrde/dev/linux-x86-64/stable/gdcm \ + --without-magickxx \ --enable-all', install_cmd=None, dist_cmd=None, @@ -130,6 +138,7 @@ f_oln_unix_gcc_4_1_64 = GNUBuildSystem(project_repos='olena', check_cmd='make -k check', distcheck_configure_args='CXX=\'ccache g++-4.1\' CC=\'ccache gcc-4.1\' \ --with-gdcm=/lrde/dev/linux-x86-64/stable/gdcm \ + --without-magickxx \ --enable-all' ) @@ -140,6 +149,7 @@ f_oln_unix_gcc_4_2 = GNUBuildSystem(project_repos='olena', extra_configure_args='CXX="ccache g++-4.2" \ CC="ccache gcc-4.2" \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ + --without-magickxx \ --enable-all', install_cmd=None, dist_cmd=None, @@ -149,6 +159,7 @@ f_oln_unix_gcc_4_2 = GNUBuildSystem(project_repos='olena', distcheck_configure_args='CXX=\'ccache g++-4.2\' \ CC=\'ccache gcc-4.2\' \ --enable-all \ + --without-magickxx \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm' ) # pretty_check_cmd="yes" @@ -163,6 +174,7 @@ f_oln_unix_icc_10 = GNUBuildSystem(project_repos='olena', CXXFLAGS="-I/amd/beyrouth/home/lrde/admin/build/local/" \ ./configure \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ + --without-magickxx \ --enable-all', install_dir='olena_icc_10', install_cmd=None, @@ -181,6 +193,7 @@ f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena', CXXFLAGS="-I/amd/beyrouth/home/lrde/admin/build/local/" \ ./configure \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ + --without-magickxx \ --enable-all', install_dir='olena_icc_11', install_cmd=None, @@ -214,6 +227,7 @@ f_oln_unix_gcc3 = GNUBuildSystem(project_repos='olena', extra_configure_args='CC="ccache gcc-3.3" \ CXX="ccache g++-3.3" \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ + --without-magickxx \ --enable-all --disable-scribo', install_cmd=None, dist_cmd=None, -- 1.5.6.5