From e253f7c708a12567439aac7e28f43a6fe93eeaee Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 3 Jul 2022 18:26:11 +0200 Subject: [PATCH] Enable building, testing and log uploading for binutils libctf The fedora-x86_64, fedora-s390x fedora-ppc64le, opensuse tumbleweed-x86_64 and rawhide-x86_64 have been upgraded and use GCC12 and can build and test libctf now. --- builder/master.cfg | 83 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 10 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index 63d80d8..92a6981 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -1575,6 +1575,14 @@ binutils_step_configure = steps.Configure( '--enable-shared'], name='configure', haltOnFailure=True) +binutils_step_configure_libctf = steps.Configure( + workdir='binutils-build', + command=['../binutils-gdb/configure', + '--enable-gold', + '--enable-libctf', + '--enable-shared'], + name='configure', + haltOnFailure=True) binutils_step_configure_target_all = steps.Configure( workdir='binutils-build', command=['../binutils-gdb/configure', @@ -1583,6 +1591,15 @@ binutils_step_configure_target_all = steps.Configure( '--enable-targets=all'], name='configure', haltOnFailure=True) +binutils_step_configure_target_all_libctf = steps.Configure( + workdir='binutils-build', + command=['../binutils-gdb/configure', + '--enable-gold', + '--enable-shared', + '--enable-targets=all', + '--enable-libctf'], + name='configure', + haltOnFailure=True) binutils_step_compile = steps.Compile( workdir='binutils-build', command=['make', @@ -1590,6 +1607,14 @@ binutils_step_compile = steps.Compile( 'all-gas', 'all-ld', 'all-binutils', 'all-gold'], name='make', haltOnFailure=True) +binutils_step_compile_libctf = steps.Compile( + workdir='binutils-build', + command=['make', + util.Interpolate('-j%(prop:ncpus)s'), + 'all-gas', 'all-ld', 'all-binutils', 'all-gold', + 'all-libctf'], + name='make', + haltOnFailure=True) binutils_step_check = steps.Test( workdir='binutils-build', command=['make', @@ -1609,6 +1634,28 @@ binutils_steps_bunsen = bunsen_logfile_upload_steps([ (["../binutils-build/gas/config.log"], "gas"), (["../binutils-build/binutils/binutils.sum", "../binutils-build/binutils/binutils.log", "../binutils-build/binutils/config.log"], "binutils")]) +binutils_step_check_libctf = steps.Test( + workdir='binutils-build', + command=['make', + util.Interpolate('-j%(prop:ncpus)s'), + 'check-ld', 'check-gas', 'check-binutils', 'check-libctf'], + name='make check', + logfiles={ "ld.sum": "ld/ld.sum", + "ld.log": "ld/ld.log", + "gas.sum": "gas/testsuite/gas.sum", + "gas.log": "gas/testsuite/gas.log", + "binutils.sum": "binutils/binutils.sum", + "binutils.log": "binutils/binutils.log", + "libctf.sum": "libctf/libctf.sum", + "libctf.log": "libctf/libctf.log" }, + haltOnFailure=False, flunkOnFailure=True) +binutils_steps_bunsen_libctf = bunsen_logfile_upload_steps([ + (["../binutils-build/ld/ld.sum", "../binutils-build/ld/ld.log", "../binutils-build/ld/config.log"], "ld"), + (["../binutils-build/gas/testsuite/gas.sum", "../binutils-build/gas/testsuite/gas.log"], "gas/testsuite"), + (["../binutils-build/gas/config.log"], "gas"), + (["../binutils-build/binutils/binutils.sum", "../binutils-build/binutils/binutils.log", "../binutils-build/binutils/config.log"], "binutils"), + (["../binutils-build/libctf/libctf.sum", "../binutils-build/libctf/libctf.log", "../libctf-build/libctf/config.log"], "libctf")]) + binutils_step_check_gas_binutils = steps.Test( workdir='binutils-build', command=['make', @@ -1633,6 +1680,14 @@ binutils_factory.addStep(binutils_step_compile) binutils_factory.addStep(binutils_step_check) binutils_factory.addSteps(binutils_steps_bunsen) +binutils_factory_libctf = util.BuildFactory() +binutils_factory_libctf.addStep(binutils_step_git) +binutils_factory_libctf.addStep(binutils_step_rm_build_dir) +binutils_factory_libctf.addStep(binutils_step_configure_libctf) +binutils_factory_libctf.addStep(binutils_step_compile_libctf) +binutils_factory_libctf.addStep(binutils_step_check_libctf) +binutils_factory_libctf.addSteps(binutils_steps_bunsen_libctf) + binutils_factory_target_all = util.BuildFactory() binutils_factory_target_all.addStep(binutils_step_git) binutils_factory_target_all.addStep(binutils_step_rm_build_dir) @@ -1641,6 +1696,14 @@ binutils_factory_target_all.addStep(binutils_step_compile) binutils_factory_target_all.addStep(binutils_step_check) binutils_factory_target_all.addSteps(binutils_steps_bunsen) +binutils_factory_target_all_libctf = util.BuildFactory() +binutils_factory_target_all_libctf.addStep(binutils_step_git) +binutils_factory_target_all_libctf.addStep(binutils_step_rm_build_dir) +binutils_factory_target_all_libctf.addStep(binutils_step_configure_target_all_libctf) +binutils_factory_target_all_libctf.addStep(binutils_step_compile_libctf) +binutils_factory_target_all_libctf.addStep(binutils_step_check_libctf) +binutils_factory_target_all_libctf.addSteps(binutils_steps_bunsen_libctf) + # Builds everything, but checks just gas and binutils, not ld. binutils_factory_gas_binutils = util.BuildFactory() binutils_factory_gas_binutils.addStep(binutils_step_git) @@ -1675,7 +1738,7 @@ binutils_fedora_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-latest')}, workernames=vm_workers, tags=["binutils", "fedora", "x86_64"], - factory=binutils_factory) + factory=binutils_factory_libctf) c['builders'].append(binutils_fedora_x86_64_builder) binutils_try_fedora_x86_64_builder = util.BuilderConfig( @@ -1685,21 +1748,21 @@ binutils_try_fedora_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-latest')}, workernames=vm_workers, tags=["binutils-try", "fedora", "x86_64"], - factory=binutils_factory) + factory=binutils_factory_libctf) c['builders'].append(binutils_try_fedora_x86_64_builder) binutils_fedora_s390x_builder = util.BuilderConfig( name="binutils-fedora-s390x", workernames=["fedora-s390x"], tags=["binutils", "fedora", "s390x"], - factory=binutils_factory) + factory=binutils_factory_libctf) c['builders'].append(binutils_fedora_s390x_builder) binutils_try_fedora_s390x_builder = util.BuilderConfig( name="binutils-try-fedora-s390x", workernames=["fedora-s390x"], tags=["binutils-try", "fedora", "s390x"], - factory=binutils_factory) + factory=binutils_factory_libctf) c['builders'].append(binutils_try_fedora_s390x_builder) binutils_debian_ppc64_builder = util.BuilderConfig( @@ -1744,7 +1807,7 @@ binutils_fedora_ppc64le_builder = util.BuilderConfig( name="binutils-fedora-ppc64le", workernames=["fedora-ppc64le"], tags=["binutils", "fedora", "ppc64le"], - factory=binutils_factory) + factory=binutils_factory_libctf) c['builders'].append(binutils_fedora_ppc64le_builder) binutils_try_fedora_ppc64le_builder = util.BuilderConfig( @@ -1752,7 +1815,7 @@ binutils_try_fedora_ppc64le_builder = util.BuilderConfig( collapseRequests=True, workernames=["fedora-ppc64le"], tags=["binutils-try", "fedora", "ppc64le"], - factory=binutils_factory) + factory=binutils_factory_libctf) c['builders'].append(binutils_try_fedora_ppc64le_builder) binutils_opensusetw_x86_64_builder = util.BuilderConfig( @@ -1761,7 +1824,7 @@ binutils_opensusetw_x86_64_builder = util.BuilderConfig( readContainerFile('opensuse-tumbleweed')}, workernames=vm_workers, tags=["binutils", "opensusetw", "x86_64"], - factory=binutils_factory_target_all) + factory=binutils_factory_target_all_libctf) c['builders'].append(binutils_opensusetw_x86_64_builder) binutils_try_opensusetw_x86_64_builder = util.BuilderConfig( @@ -1771,7 +1834,7 @@ binutils_try_opensusetw_x86_64_builder = util.BuilderConfig( readContainerFile('opensuse-tumbleweed')}, workernames=vm_workers, tags=["binutils-try", "opensusetw", "x86_64"], - factory=binutils_factory_target_all) + factory=binutils_factory_target_all_libctf) c['builders'].append(binutils_try_opensusetw_x86_64_builder) binutils_opensuseleap_x86_64_builder = util.BuilderConfig( @@ -1789,7 +1852,7 @@ binutils_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["binutils", "fedora", "x86_64"], - factory=binutils_factory) + factory=binutils_factory_libctf) c['builders'].append(binutils_rawhide_x86_64_builder) binutils_try_opensuseleap_x86_64_builder = util.BuilderConfig( @@ -1809,7 +1872,7 @@ binutils_try_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["binutils-try", "fedora", "x86_64"], - factory=binutils_factory) + factory=binutils_factory_libctf) c['builders'].append(binutils_try_rawhide_x86_64_builder) # gdb build steps, factory and builders -- 2.30.2