From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 67F0C3858D20 for ; Sun, 12 Nov 2023 22:08:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 67F0C3858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 67F0C3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=45.83.234.184 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699826896; cv=none; b=KXYM6WWJEmtPkMyr5oug5KJVO7vpHbdsbsP8GM7Dy9ur1NPRVkuDwJKno6+sFQbfVnzRAqd3P+2BaqM54AC1MKo9CkeVap/q+AfSYwvv7w/UovdkrhVGHEhVlHecy26EUpxDDa84nU5B6jEkau2Dz/eC5+5tHsaucmPQ82o3dS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699826896; c=relaxed/simple; bh=pHlc4vEpV+IG1blMXYl5pgN60wJm9mQBprXSE+N0uVo=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=NRNJq9zWPePultM1Y6mTJf14KDQSLlfbd7+H5aP2i2uJeXJFeRLEpq9EG8UEAcpxNNQiuuPt6DxME5YmTcrlQFWbBAlk3mNZ+74z0rYY3k4g7xYu8YHHd1tk2Z9Vwm20TdiEQlVfR15S5qGvrQH+Qeu7cWBoS0GkNk3Fp3ruEQo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from csb.redhat.com (deer0x03.wildebeest.org [172.31.17.133]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id E238B302FDD8; Sun, 12 Nov 2023 23:08:12 +0100 (CET) Received: by csb.redhat.com (Postfix, from userid 10916) id C55FBCB959; Sun, 12 Nov 2023 23:08:12 +0100 (CET) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] Use --disable-sim for centos7 gdb builder Date: Sun, 12 Nov 2023 23:08:08 +0100 Message-Id: <20231112220808.1567177-1-mark@klomp.org> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3034.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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