From b103e458d2a4ae591153078f3e03305b25628339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Thu, 7 Nov 2024 16:26:31 +0100 Subject: [PATCH] Batch update of various changes --- tests/bugs/Backport-relro_padding-entsize-fix/main.fmf | 4 ++++ tests/bugs/Disable-separate-code-for-aarch64/main.fmf | 7 +++---- tests/bugs/when-mistaking-argument-of-strings/test.sh | 6 ++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/bugs/Backport-relro_padding-entsize-fix/main.fmf b/tests/bugs/Backport-relro_padding-entsize-fix/main.fmf index dabfd26..61e9bf2 100644 --- a/tests/bugs/Backport-relro_padding-entsize-fix/main.fmf +++ b/tests/bugs/Backport-relro_padding-entsize-fix/main.fmf @@ -7,3 +7,7 @@ require+: link+: - verifies: https://issues.redhat.com/browse/RHEL-50536 + +adjust+: + - when: distro != rhel-9 or distro < rhel-9.5.0 + enabled: false diff --git a/tests/bugs/Disable-separate-code-for-aarch64/main.fmf b/tests/bugs/Disable-separate-code-for-aarch64/main.fmf index 36bfd85..d096cc0 100644 --- a/tests/bugs/Disable-separate-code-for-aarch64/main.fmf +++ b/tests/bugs/Disable-separate-code-for-aarch64/main.fmf @@ -5,7 +5,6 @@ duration: 10m link+: - verifies: https://issues.redhat.com/browse/RHEL-42954 -#adjust+: -# - when: arch != aarch64 -# because: Test is relevant for aarch64 only -# enabled: false +adjust+: + - when: arch == x86_64 + enabled: false diff --git a/tests/bugs/when-mistaking-argument-of-strings/test.sh b/tests/bugs/when-mistaking-argument-of-strings/test.sh index 6f52627..242c318 100755 --- a/tests/bugs/when-mistaking-argument-of-strings/test.sh +++ b/tests/bugs/when-mistaking-argument-of-strings/test.sh @@ -50,6 +50,9 @@ rlJournalStart elif rlIsRHEL ">= 10"; then rlAssertGrep "minimum string length is too small: 0" output + elif rlIsRHEL ">= 10" && [ "$TOOLSET" = "gcc-toolset-14" ]; then + rlAssertGrep "minimum string length is too small: 0" output + else rlAssertGrep "invalid minimum string length 0" output fi @@ -66,6 +69,9 @@ rlJournalStart elif rlIsRHEL ">= 10"; then rlAssertGrep "minimum string length is too small: 0" output + elif rlIsRHEL ">= 10" && [ "$TOOLSET" = "gcc-toolset-14" ]; then + rlAssertGrep "minimum string length is too small: 0" output + else rlAssertGrep "invalid minimum string length 0" output fi