Support gcc-toolset-14

2024-06-04 12:48:37 +02:00 · 2024-06-04 12:48:37 +02:00 · 77ed99d023
commit 77ed99d023
parent ad56a109c1
8 changed files with 140 additions and 0 deletions
--- a/tests/bugs/Add-.debug_pubtypes-and-.debug_ranges-to-builtin-ld-linker-script/main.fmf
+++ b/tests/bugs/Add-.debug_pubtypes-and-.debug_ranges-to-builtin-ld-linker-script/main.fmf
@ -16,6 +16,10 @@ adjust+:
    environment+:
      DWARF5: "no"

+  - when: distro == rhel-8 and collection == gcc-toolset-14
+    environment+:
+      DWARF5: "no"
+
  - when: distro == rhel-8 and collection == gcc-toolset-13
    environment+:
      DWARF5: "no"
--- a/tests/bugs/TLS-variable-wrongly-relocated-on-debug-info/main.fmf
+++ b/tests/bugs/TLS-variable-wrongly-relocated-on-debug-info/main.fmf
@ -9,6 +9,12 @@ require+:
  - gdb

 adjust+:
+  - when: collection == gcc-toolset-14
+    require+:
+      - gcc-toolset-14-gdb
+    environment+:
+      REQUIRES: gcc-toolset-14-gdb
+
  - when: collection == gcc-toolset-13
    require+:
      - gcc-toolset-13-gdb
--- a/tests/bugs/dwz-applied-to-a-dts-compiled-binary-complains/main.fmf
+++ b/tests/bugs/dwz-applied-to-a-dts-compiled-binary-complains/main.fmf
@ -20,6 +20,12 @@ adjust+:
    environment+:
      REQUIRES: dwz

+  - when: collection == gcc-toolset-14
+    require+:
+      - gcc-toolset-14-dwz
+    environment+:
+      REQUIRES: gcc-toolset-14-dwz
+
  - when: collection == gcc-toolset-13
    require+:
      - gcc-toolset-13-dwz
--- a/tests/dts-probe-binaries/main.fmf
+++ b/tests/dts-probe-binaries/main.fmf
@ -32,6 +32,10 @@ adjust+:
  - when: collection is not defined
    enabled: false

+  - when: distro == rhel-8 and collection == gcc-toolset-14
+    environment+:
+      LEGACY_UNDEFINED_SYMBOLS: "yes"
+
  - when: distro == rhel-8 and collection == gcc-toolset-13
    environment+:
      LEGACY_UNDEFINED_SYMBOLS: "yes"
--- a/tests/main.fmf
+++ b/tests/main.fmf
@ -110,6 +110,43 @@ adjust+:
      BINUTILS_PACKAGE: binutils
      GCC_PACKAGE: gcc

+  # RHEL-9 / gcc-toolset-14
+  - when: distro == rhel-9 and collection == gcc-toolset-14 and arch == x86_64,aarch64
+    require+:
+      - gcc-toolset-14-binutils
+      - gcc-toolset-14-binutils-devel
+      - gcc-toolset-14-binutils-gold
+      - gcc-toolset-14-binutils-gprofng
+      - gcc-toolset-14-gcc
+      - gcc-toolset-14-gcc-c++
+      - gcc-toolset-14-gcc-plugin-annobin
+    environment+:
+      PACKAGES: gcc-toolset-14-binutils
+      TOOLSET: gcc-toolset-14
+      _REQUIRES: gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-plugin-annobin glibc
+      WITH_SCL: scl enable gcc-toolset-14
+      BINUTILS_PACKAGE: gcc-toolset-14-binutils
+      GCC_PACKAGE: gcc-toolset-14-gcc
+      # yamllint disable-line rule:line-length
+      COLLECTION_PACKAGES: gcc-toolset-14-binutils gcc-toolset-14-binutils-devel gcc-toolset-14-binutils-gold gcc-toolset-14-binutils-gprofng
+
+  - when: distro == rhel-9 and collection == gcc-toolset-14 and arch != x86_64 and arch != aarch64
+    require+:
+      - gcc-toolset-14-binutils
+      - gcc-toolset-14-binutils-devel
+      - gcc-toolset-14-binutils-gold
+      - gcc-toolset-14-gcc
+      - gcc-toolset-14-gcc-c++
+      - gcc-toolset-14-gcc-plugin-annobin
+    environment+:
+      PACKAGES: gcc-toolset-14-binutils
+      TOOLSET: gcc-toolset-14
+      _REQUIRES: gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-plugin-annobin glibc
+      WITH_SCL: scl enable gcc-toolset-14
+      BINUTILS_PACKAGE: gcc-toolset-14-binutils
+      GCC_PACKAGE: gcc-toolset-14-gcc
+      COLLECTION_PACKAGES: gcc-toolset-14-binutils gcc-toolset-14-binutils-devel gcc-toolset-14-binutils-gold
+
  # RHEL-9 / gcc-toolset-13
  - when: distro == rhel-9 and collection == gcc-toolset-13 and arch == x86_64,aarch64
    require+:
@ -183,6 +220,43 @@ adjust+:
      BINUTILS_PACKAGE: binutils
      GCC_PACKAGE: gcc

+  # RHEL-8 / gcc-toolset-14
+  - when: distro == rhel-8 and collection == gcc-toolset-14 and arch == x86_64,aarch64
+    require+:
+      - gcc-toolset-14-binutils
+      - gcc-toolset-14-binutils-devel
+      - gcc-toolset-14-binutils-gold
+      - gcc-toolset-14-binutils-gprofng
+      - gcc-toolset-14-gcc
+      - gcc-toolset-14-gcc-c++
+      - gcc-toolset-14-gcc-plugin-annobin
+    environment+:
+      PACKAGES: gcc-toolset-14-binutils
+      TOOLSET: gcc-toolset-14
+      _REQUIRES: gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-plugin-annobin glibc
+      WITH_SCL: scl enable gcc-toolset-14
+      BINUTILS_PACKAGE: gcc-toolset-14-binutils
+      GCC_PACKAGE: gcc-toolset-14-gcc
+      # yamllint disable-line rule:line-length
+      COLLECTION_PACKAGES: gcc-toolset-14-binutils gcc-toolset-14-binutils-devel gcc-toolset-14-binutils-gold gcc-toolset-14-binutils-gprofng
+
+  - when: distro == rhel-8 and collection == gcc-toolset-14 and arch != x86_64 and arch != aarch64
+    require+:
+      - gcc-toolset-14-binutils
+      - gcc-toolset-14-binutils-devel
+      - gcc-toolset-14-binutils-gold
+      - gcc-toolset-14-gcc
+      - gcc-toolset-14-gcc-c++
+      - gcc-toolset-14-gcc-plugin-annobin
+    environment+:
+      PACKAGES: gcc-toolset-14-binutils
+      TOOLSET: gcc-toolset-14
+      _REQUIRES: gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-plugin-annobin glibc
+      WITH_SCL: scl enable gcc-toolset-14
+      BINUTILS_PACKAGE: gcc-toolset-14-binutils
+      GCC_PACKAGE: gcc-toolset-14-gcc
+      COLLECTION_PACKAGES: gcc-toolset-14-binutils gcc-toolset-14-binutils-devel gcc-toolset-14-binutils-gold
+
  # RHEL-8 / gcc-toolset-13
  - when: distro == rhel-8 and collection == gcc-toolset-13 and arch == x86_64,aarch64
    require+:
@ -312,6 +386,26 @@ adjust+:
      BINUTILS_PACKAGE: binutils
      GCC_PACKAGE: gcc

+  # CentOS Stream 9 / gcc-toolset-14
+  - when: distro == centos-stream-9 and collection == gcc-toolset-14
+    require+:
+      - gcc-toolset-14-binutils
+      - gcc-toolset-14-binutils-devel
+      - gcc-toolset-14-binutils-gold
+      # TODO: why is it missing, not being shipped?
+      # - gcc-toolset-14-binutils-gprofng
+      - gcc-toolset-14-gcc
+      - gcc-toolset-14-gcc-c++
+      - gcc-toolset-14-gcc-plugin-annobin
+    environment+:
+      PACKAGES: gcc-toolset-14-binutils
+      TOOLSET: gcc-toolset-14
+      _REQUIRES: gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-plugin-annobin glibc
+      WITH_SCL: scl enable gcc-toolset-14
+      BINUTILS_PACKAGE: gcc-toolset-14-binutils
+      GCC_PACKAGE: gcc-toolset-14-gcc
+      COLLECTION_PACKAGES: gcc-toolset-14-binutils gcc-toolset-14-binutils-devel gcc-toolset-14-binutils-gold
+
  # CentOS Stream 9 / gcc-toolset-13
  - when: distro == centos-stream-9 and collection == gcc-toolset-13
    require+:
--- a/tests/rebuilds/kernel/main.fmf
+++ b/tests/rebuilds/kernel/main.fmf
@ -76,6 +76,10 @@ adjust+:
    require+:
      - ecj

+  - because: "kernel rebuild fails because of discovering build issues"
+    when: collection == gcc-toolset-14
+    enabled: false
+
  - because: "kernel rebuild fails because of discovering build issues"
    when: collection == gcc-toolset-13
    enabled: false
--- a/tests/selinux-context/main.fmf
+++ b/tests/selinux-context/main.fmf
@ -24,3 +24,7 @@ adjust+:
  - when: collection == gcc-toolset-13
    environment+:
      COLLECTION_ROOT: /opt/rh/gcc-toolset-13/root
+
+  - when: collection == gcc-toolset-14
+    environment+:
+      COLLECTION_ROOT: /opt/rh/gcc-toolset-14/root
--- a/tests/testsuite/main.fmf
+++ b/tests/testsuite/main.fmf
@ -37,6 +37,12 @@ adjust+:
    when: distro >= rhel-9.3 and collection is not defined
    test: "$WITH_SCL ./test-with-cross.sh"

+  - because: "On RHEL-9.3.0 and newer, gcc-toolset-14 binutils build has extra directory levels"
+    when: distro >= rhel-9.3 and collection == gcc-toolset-14
+    test: "$WITH_SCL ./test-with-cross.sh"
+    environment+:
+      MAY_BUILD_OTHER_ARCHES: "no"
+
  - because: "On RHEL-9.3.0 and newer, gcc-toolset-13 binutils build has extra directory levels"
    when: distro >= rhel-9.3 and collection == gcc-toolset-13
    test: "$WITH_SCL ./test-with-cross.sh"
@ -49,6 +55,12 @@ adjust+:
    environment+:
      MAY_BUILD_OTHER_ARCHES: "no"

+  - because: "On RHEL-8.10.0 and newer, gcc-toolset-14 binutils build has extra directory levels"
+    when: distro == rhel-8.10 and collection == gcc-toolset-14
+    test: "$WITH_SCL ./test-with-cross.sh"
+    environment+:
+      MAY_BUILD_OTHER_ARCHES: "no"
+
  - because: "On RHEL-8.10.0 and newer, gcc-toolset-13 binutils build has extra directory levels"
    when: distro == rhel-8.10 and collection == gcc-toolset-13
    test: "$WITH_SCL ./test-with-cross.sh"
@ -59,6 +71,12 @@ adjust+:
    when: distro == centos-stream-9 and collection is not defined
    test: "$WITH_SCL ./test-with-cross.sh"

+  - because: "On CentOS Stream 9, gcc-toolset-14 build has extra directory levels"
+    when: distro == centos-stream-9 and collection == gcc-toolset-14
+    test: "$WITH_SCL ./test-with-cross.sh"
+    environment+:
+      MAY_BUILD_OTHER_ARCHES: "no"
+
  - because: "On CentOS Stream 9, gcc-toolset-13 build has extra directory levels"
    when: distro == centos-stream-9 and collection == gcc-toolset-13
    test: "$WITH_SCL ./test-with-cross.sh"