[PATCH] Use --disable-sim for centos7 gdb builder

[PATCH] Use --disable-sim for centos7 gdb builder

[Mark Wielaard]

Rename gdb_32_factory to gdb_no_sim_factory and also use for
gdb-centos-x86_64 builder.
---
 builder/master.cfg | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/builder/master.cfg b/builder/master.cfg
index 51c12b9..b59adf2 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -2853,8 +2853,8 @@ gdb_configure_step = steps.Configure(
         name='configure',
         haltOnFailure=True,
         logfiles={"config.log": "config.log"})
-# Use on 32bit platforms, building sim is broken
-gdb_configure_32_step = steps.Configure(
+# Use on 32bit platforms and old centos7, building sim is broken
+gdb_configure_no_sim_step = steps.Configure(
         workdir='gdb-build',
         command=['../binutils-gdb/configure',
                  '--enable-targets=all',
@@ -2955,27 +2955,27 @@ gdb_factory.addSteps(bunsen_logfile_upload_cpio_steps( # only a few tests being
         tagsuffix='/extended-gdbserver'))
 gdb_factory.addStep(gdb_rm_step)
 
-gdb_32_factory = util.BuildFactory()
-gdb_32_factory.addStep(gdb_git_step)
-gdb_32_factory.addStep(gdb_rm_step)
-gdb_32_factory.addStep(gdb_configure_32_step)
-gdb_32_factory.addStep(gdb_make_step)
-gdb_32_factory.addStep(make_gdb_check_step())
-gdb_32_factory.addSteps(bunsen_logfile_upload_cpio_steps(
+gdb_no_sim_factory = util.BuildFactory()
+gdb_no_sim_factory.addStep(gdb_git_step)
+gdb_no_sim_factory.addStep(gdb_rm_step)
+gdb_no_sim_factory.addStep(gdb_configure_no_sim_step)
+gdb_no_sim_factory.addStep(gdb_make_step)
+gdb_no_sim_factory.addStep(make_gdb_check_step())
+gdb_no_sim_factory.addSteps(bunsen_logfile_upload_cpio_steps(
         ["*.sum", "*.log"],
         workdir='gdb-build',
         tagsuffix='/native'))
-gdb_32_factory.addStep(make_gdb_check_step('--target_board=native-gdbserver'))
-gdb_32_factory.addSteps(bunsen_logfile_upload_cpio_steps(
+gdb_no_sim_factory.addStep(make_gdb_check_step('--target_board=native-gdbserver'))
+gdb_no_sim_factory.addSteps(bunsen_logfile_upload_cpio_steps(
         ["*.sum", "*.log"],
         workdir='gdb-build',
         tagsuffix='/gdbserver'))
-gdb_32_factory.addStep(make_gdb_check_step('--target_board=native-extended-gdbserver'))
-gdb_32_factory.addSteps(bunsen_logfile_upload_cpio_steps(
+gdb_no_sim_factory.addStep(make_gdb_check_step('--target_board=native-extended-gdbserver'))
+gdb_no_sim_factory.addSteps(bunsen_logfile_upload_cpio_steps(
         ["*.sum", "*.log"],
         workdir='gdb-build',
         tagsuffix='/extended-gdbserver'))
-gdb_32_factory.addStep(gdb_rm_step)
+gdb_no_sim_factory.addStep(gdb_rm_step)
 
 gdb_black_factory = util.BuildFactory()
 gdb_black_factory.addStep(gdb_git_step)
@@ -3005,7 +3005,7 @@ gdb_black_factory.addStep(gdb_rm_step)
 gdb_32_factory_make_only = util.BuildFactory()
 gdb_32_factory_make_only.addStep(gdb_git_step)
 gdb_32_factory_make_only.addStep(gdb_rm_step)
-gdb_32_factory_make_only.addStep(gdb_configure_32_step)
+gdb_32_factory_make_only.addStep(gdb_configure_no_sim_step)
 gdb_32_factory_make_only.addStep(gdb_make_step)
 # NB: no need to fully BUNSEN ME, test suites are not actually being run
 gdb_32_factory_make_only.addSteps(bunsen_logfile_upload_steps([ # no tests being run - but can save the autoconf config.log
@@ -3053,7 +3053,7 @@ gdb_centos_x86_64_builder = util.BuilderConfig(
 	name="gdb-centos-x86_64",
         workernames=["centos-x86_64"],
         tags=["gdb-broken", "centos", "x86_64"],
-        factory=gdb_factory)
+        factory=gdb_no_sim_factory)
 c['builders'].append(gdb_centos_x86_64_builder)
 
 #gdb_try_centos_x86_64_builder = util.BuilderConfig(
@@ -3142,7 +3142,7 @@ gdb_debian_i386_builder = util.BuilderConfig(
 	name="gdb-debian-i386",
         workernames=debian_i386_workers,
         tags=["gdb", "debian", "i386"],
-        factory=gdb_32_factory)
+        factory=gdb_no_sim_factory)
 c['builders'].append(gdb_debian_i386_builder)
 
 gdb_try_debian_i386_builder = util.BuilderConfig(
@@ -3150,7 +3150,7 @@ gdb_try_debian_i386_builder = util.BuilderConfig(
         collapseRequests=True,
         workernames=debian_i386_workers,
         tags=["gdb-try", "debian", "i386"],
-        factory=gdb_32_factory)
+        factory=gdb_no_sim_factory)
 c['builders'].append(gdb_try_debian_i386_builder)
 
 gdb_fedora_s390x_builder = util.BuilderConfig(
-- 
2.39.3