From 0397f143aabd16efbc3880e54abfbca867b0e9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= Date: Tue, 20 Aug 2024 10:18:03 +0200 Subject: [PATCH] Support GTS annobin --- .../main.fmf | 2 +- .../main.fmf | 2 +- .../main.fmf | 2 +- .../main.fmf | 2 +- .../main.fmf | 2 +- .../main.fmf | 2 +- Regression/lto-preprocessor-options/main.fmf | 2 +- .../main.fmf | 2 +- .../main.fmf | 2 +- Regression/testsuite/main.fmf | 2 +- .../main.fmf | 2 +- main.fmf | 211 ++++++++++++++++++ plans/main.fmf | 3 + 13 files changed, 225 insertions(+), 11 deletions(-) create mode 100644 main.fmf create mode 100644 plans/main.fmf diff --git a/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf b/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf index 02b3f9d..0146f1e 100644 --- a/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf +++ b/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf @@ -7,7 +7,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - gcc - redhat-rpm-config recommend: diff --git a/Regression/bz1998472-annocheck-complains-MAYB-test-notes-on-empty/main.fmf b/Regression/bz1998472-annocheck-complains-MAYB-test-notes-on-empty/main.fmf index 9f84ba4..8adf092 100644 --- a/Regression/bz1998472-annocheck-complains-MAYB-test-notes-on-empty/main.fmf +++ b/Regression/bz1998472-annocheck-complains-MAYB-test-notes-on-empty/main.fmf @@ -7,7 +7,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - redhat-rpm-config recommend: - annobin diff --git a/Regression/bz2004917-using-g-in-gcc-breaks-annocheck-LTO-report/main.fmf b/Regression/bz2004917-using-g-in-gcc-breaks-annocheck-LTO-report/main.fmf index 91cde9f..fca5993 100644 --- a/Regression/bz2004917-using-g-in-gcc-breaks-annocheck-LTO-report/main.fmf +++ b/Regression/bz2004917-using-g-in-gcc-breaks-annocheck-LTO-report/main.fmf @@ -7,7 +7,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - redhat-rpm-config recommend: - annobin-plugin-gcc diff --git a/Regression/bz2005322-annocheck-says-PASS-lto-test-on-non-LTO/main.fmf b/Regression/bz2005322-annocheck-says-PASS-lto-test-on-non-LTO/main.fmf index dbff6b5..5cb9db5 100644 --- a/Regression/bz2005322-annocheck-says-PASS-lto-test-on-non-LTO/main.fmf +++ b/Regression/bz2005322-annocheck-says-PASS-lto-test-on-non-LTO/main.fmf @@ -7,7 +7,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - redhat-rpm-config - gcc-c++ recommend: diff --git a/Regression/bz2009958-annobin-Plugin-diagnostics-for-D-FORTIFY-SOURCE/main.fmf b/Regression/bz2009958-annobin-Plugin-diagnostics-for-D-FORTIFY-SOURCE/main.fmf index 3da2028..eeeec4c 100644 --- a/Regression/bz2009958-annobin-Plugin-diagnostics-for-D-FORTIFY-SOURCE/main.fmf +++ b/Regression/bz2009958-annobin-Plugin-diagnostics-for-D-FORTIFY-SOURCE/main.fmf @@ -7,7 +7,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - gcc recommend: - annobin-plugin-gcc diff --git a/Regression/bz2097065-annobin-annobin-docs-subpackage-incorrectly/main.fmf b/Regression/bz2097065-annobin-annobin-docs-subpackage-incorrectly/main.fmf index 56ec0c1..be738f6 100644 --- a/Regression/bz2097065-annobin-annobin-docs-subpackage-incorrectly/main.fmf +++ b/Regression/bz2097065-annobin-annobin-docs-subpackage-incorrectly/main.fmf @@ -7,7 +7,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - cpio recommend: - annobin-plugin-gcc diff --git a/Regression/lto-preprocessor-options/main.fmf b/Regression/lto-preprocessor-options/main.fmf index 8a2fc01..c0e3775 100644 --- a/Regression/lto-preprocessor-options/main.fmf +++ b/Regression/lto-preprocessor-options/main.fmf @@ -5,7 +5,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - redhat-rpm-config recommend: - annobin-plugin-gcc diff --git a/Regression/report-missing-FORTIFY-SOURCE-as-error/main.fmf b/Regression/report-missing-FORTIFY-SOURCE-as-error/main.fmf index a6c63ac..df673d6 100644 --- a/Regression/report-missing-FORTIFY-SOURCE-as-error/main.fmf +++ b/Regression/report-missing-FORTIFY-SOURCE-as-error/main.fmf @@ -7,7 +7,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - redhat-rpm-config recommend: - annobin-plugin-gcc diff --git a/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf b/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf index 60bebb1..3656220 100644 --- a/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf +++ b/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf @@ -7,7 +7,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - libstdc++ recommend: - annobin-plugin-gcc diff --git a/Regression/testsuite/main.fmf b/Regression/testsuite/main.fmf index f20b921..d238f25 100644 --- a/Regression/testsuite/main.fmf +++ b/Regression/testsuite/main.fmf @@ -5,7 +5,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - binutils-devel - bzip2-devel - make diff --git a/Sanity/bz2067148-support_syncing_with_gcc/main.fmf b/Sanity/bz2067148-support_syncing_with_gcc/main.fmf index cb0708e..71e6a02 100644 --- a/Sanity/bz2067148-support_syncing_with_gcc/main.fmf +++ b/Sanity/bz2067148-support_syncing_with_gcc/main.fmf @@ -5,7 +5,7 @@ component: - annobin test: ${WITH_SCL:-bash} ./runtest.sh framework: beakerlib -require: +require+: - annobin-annocheck - binutils-devel - gcc diff --git a/main.fmf b/main.fmf new file mode 100644 index 0000000..27d518f --- /dev/null +++ b/main.fmf @@ -0,0 +1,211 @@ +# Require GTS/DTS RPMs when testing GTS/DTS +adjust: + - when: collection == gcc-toolset-12 + require+: + - gcc-toolset-12-gcc + - gcc-toolset-12-gcc-c++ + - gcc-toolset-12-gcc-gfortran + - gcc-toolset-12-gcc-plugin-devel + - gcc-toolset-12-libasan-devel + - gcc-toolset-12-libatomic-devel + - gcc-toolset-12-libgccjit + - gcc-toolset-12-libgccjit-devel + - gcc-toolset-12-libitm-devel + - gcc-toolset-12-liblsan-devel + - gcc-toolset-12-libstdc++-devel + - gcc-toolset-12-libstdc++-docs + - gcc-toolset-12-libtsan-devel + - gcc-toolset-12-libubsan-devel + - gcc-toolset-12-annobin-plugin-gcc + - gcc-toolset-12-annobin-annocheck + - gcc-toolset-12-gdb + - when: collection == devtoolset-12 + require+: + - devtoolset-12-gcc + - devtoolset-12-gcc-c++ + - devtoolset-12-gcc-gfortran + - devtoolset-12-gcc-plugin-devel + - devtoolset-12-libasan-devel + - devtoolset-12-libatomic-devel + - devtoolset-12-libgccjit + - devtoolset-12-libgccjit-devel + - devtoolset-12-libitm-devel + - devtoolset-12-liblsan-devel + - devtoolset-12-libstdc++-devel + - devtoolset-12-libstdc++-docs + - devtoolset-12-libtsan-devel + - devtoolset-12-libubsan-devel + - devtoolset-12-annobin-plugin-gcc + - devtoolset-12-annobin-annocheck + - devtoolset-12-gdb + - when: collection == gcc-toolset-13 + require+: + - gcc-toolset-13-gcc + - gcc-toolset-13-gcc-c++ + - gcc-toolset-13-gcc-gfortran + - gcc-toolset-13-gcc-plugin-annobin + - gcc-toolset-13-gcc-plugin-devel + - gcc-toolset-13-libasan-devel + - gcc-toolset-13-libatomic-devel + - gcc-toolset-13-libgccjit + - gcc-toolset-13-libgccjit-devel + - gcc-toolset-13-libitm-devel + - gcc-toolset-13-liblsan-devel + - gcc-toolset-13-libstdc++-devel + - gcc-toolset-13-libstdc++-docs + - gcc-toolset-13-libtsan-devel + - gcc-toolset-13-libubsan-devel + - gcc-toolset-13-annobin-plugin-gcc + - gcc-toolset-13-annobin-annocheck + - gcc-toolset-13-gdb + - when: collection == devtoolset-13 + require+: + - devtoolset-13-gcc + - devtoolset-13-gcc-c++ + - devtoolset-13-gcc-gfortran + - devtoolset-13-gcc-plugin-devel + - devtoolset-13-libasan-devel + - devtoolset-13-libatomic-devel + - devtoolset-13-libgccjit + - devtoolset-13-libgccjit-devel + - devtoolset-13-libitm-devel + - devtoolset-13-liblsan-devel + - devtoolset-13-libstdc++-devel + - devtoolset-13-libstdc++-docs + - devtoolset-13-libtsan-devel + - devtoolset-13-libubsan-devel + - devtoolset-13-annobin-plugin-gcc + - devtoolset-13-annobin-annocheck + - devtoolset-13-gdb + - when: collection == gcc-toolset-14 + require+: + - gcc-toolset-14-gcc + - gcc-toolset-14-gcc-c++ + - gcc-toolset-14-gcc-gfortran + - gcc-toolset-14-gcc-plugin-annobin + - gcc-toolset-14-gcc-plugin-devel + - gcc-toolset-14-libasan-devel + - gcc-toolset-14-libatomic-devel + - gcc-toolset-14-libgccjit + - gcc-toolset-14-libgccjit-devel + - gcc-toolset-14-libitm-devel + - gcc-toolset-14-liblsan-devel + - gcc-toolset-14-libstdc++-devel + - gcc-toolset-14-libstdc++-docs + - gcc-toolset-14-libtsan-devel + - gcc-toolset-14-libubsan-devel + - gcc-toolset-14-annobin-plugin-gcc + - gcc-toolset-14-annobin-annocheck + - when: collection == gcc-toolset-14 and distro < rhel-9 + require+: + - gcc-toolset-14-gdb + - when: collection == gcc-toolset-15 + require+: + - gcc-toolset-15-gcc + - gcc-toolset-15-gcc-c++ + - gcc-toolset-15-gcc-gfortran + - gcc-toolset-15-gcc-plugin-annobin + - gcc-toolset-15-gcc-plugin-devel + - gcc-toolset-15-libasan-devel + - gcc-toolset-15-libatomic-devel + - gcc-toolset-15-libgccjit + - gcc-toolset-15-libgccjit-devel + - gcc-toolset-15-libitm-devel + - gcc-toolset-15-liblsan-devel + - gcc-toolset-15-libstdc++-devel + - gcc-toolset-15-libstdc++-docs + - gcc-toolset-15-libtsan-devel + - gcc-toolset-15-libubsan-devel + - gcc-toolset-15-annobin-plugin-gcc + - gcc-toolset-15-annobin-annocheck + - when: collection == gcc-toolset-15 and distro < rhel-9 + require+: + - gcc-toolset-15-gdb + - when: collection == gcc-toolset-16 + require+: + - gcc-toolset-16-gcc + - gcc-toolset-16-gcc-c++ + - gcc-toolset-16-gcc-gfortran + - gcc-toolset-16-gcc-plugin-annobin + - gcc-toolset-16-gcc-plugin-devel + - gcc-toolset-16-libasan-devel + - gcc-toolset-16-libatomic-devel + - gcc-toolset-16-libgccjit + - gcc-toolset-16-libgccjit-devel + - gcc-toolset-16-libitm-devel + - gcc-toolset-16-liblsan-devel + - gcc-toolset-16-libstdc++-devel + - gcc-toolset-16-libstdc++-docs + - gcc-toolset-16-libtsan-devel + - gcc-toolset-16-libubsan-devel + - gcc-toolset-16-annobin-plugin-gcc + - gcc-toolset-16-annobin-annocheck + - when: collection == gcc-toolset-16 and distro < rhel-9 + require+: + - gcc-toolset-16-gdb + - when: collection == gcc-toolset-17 + require+: + - gcc-toolset-17-gcc + - gcc-toolset-17-gcc-c++ + - gcc-toolset-17-gcc-gfortran + - gcc-toolset-17-gcc-plugin-annobin + - gcc-toolset-17-gcc-plugin-devel + - gcc-toolset-17-libasan-devel + - gcc-toolset-17-libatomic-devel + - gcc-toolset-17-libgccjit + - gcc-toolset-17-libgccjit-devel + - gcc-toolset-17-libitm-devel + - gcc-toolset-17-liblsan-devel + - gcc-toolset-17-libstdc++-devel + - gcc-toolset-17-libstdc++-docs + - gcc-toolset-17-libtsan-devel + - gcc-toolset-17-libubsan-devel + - gcc-toolset-17-annobin-plugin-gcc + - gcc-toolset-17-annobin-annocheck + - when: collection == gcc-toolset-17 and distro < rhel-9 + require+: + - gcc-toolset-17-gdb + - when: collection == gcc-toolset-18 + require+: + - gcc-toolset-18-gcc + - gcc-toolset-18-gcc-c++ + - gcc-toolset-18-gcc-gfortran + - gcc-toolset-18-gcc-plugin-annobin + - gcc-toolset-18-gcc-plugin-devel + - gcc-toolset-18-libasan-devel + - gcc-toolset-18-libatomic-devel + - gcc-toolset-18-libgccjit + - gcc-toolset-18-libgccjit-devel + - gcc-toolset-18-libitm-devel + - gcc-toolset-18-liblsan-devel + - gcc-toolset-18-libstdc++-devel + - gcc-toolset-18-libstdc++-docs + - gcc-toolset-18-libtsan-devel + - gcc-toolset-18-libubsan-devel + - gcc-toolset-18-annobin-plugin-gcc + - gcc-toolset-18-annobin-annocheck + - when: collection == gcc-toolset-18 and distro < rhel-9 + require+: + - gcc-toolset-18-gdb + - when: collection == gcc-toolset-19 + require+: + - gcc-toolset-19-gcc + - gcc-toolset-19-gcc-c++ + - gcc-toolset-19-gcc-gfortran + - gcc-toolset-19-gcc-plugin-annobin + - gcc-toolset-19-gcc-plugin-devel + - gcc-toolset-19-libasan-devel + - gcc-toolset-19-libatomic-devel + - gcc-toolset-19-libgccjit + - gcc-toolset-19-libgccjit-devel + - gcc-toolset-19-libitm-devel + - gcc-toolset-19-liblsan-devel + - gcc-toolset-19-libstdc++-devel + - gcc-toolset-19-libstdc++-docs + - gcc-toolset-19-libtsan-devel + - gcc-toolset-19-libubsan-devel + - gcc-toolset-19-annobin-plugin-gcc + - gcc-toolset-19-annobin-annocheck + - when: collection == gcc-toolset-19 and distro < rhel-9 + require+: + - gcc-toolset-19-gdb diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..3db78d6 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,3 @@ +# don't inherit anything from the common main.fmf +/: + inherit: false