From 37d46f62b4245d42cb0e626b6cf705f0646b47ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= Date: Thu, 29 Apr 2021 11:00:35 +0200 Subject: [PATCH] More precise setup in the #1311352 CI test --- .../main.fmf | 1 - .../runtest.sh | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/main.fmf b/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/main.fmf index d0eaff9..6be3d1c 100644 --- a/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/main.fmf +++ b/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/main.fmf @@ -11,7 +11,6 @@ recommend: - binutils - strace - nscd -- glibc-debuginfo duration: 15m extra-summary: /tools/binutils/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow extra-task: /tools/binutils/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow diff --git a/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/runtest.sh b/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/runtest.sh index 99572d6..01ffcdd 100755 --- a/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/runtest.sh +++ b/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/runtest.sh @@ -39,6 +39,7 @@ rlJournalStart rlLogInfo "REQUIRES=$REQUIRES" rlLogInfo "COLLECTIONS=$COLLECTIONS" rlLogInfo "SKIP_COLLECTION_METAPACKAGE_CHECK=$SKIP_COLLECTION_METAPACKAGE_CHECK" + rlRun "ARCH=$(arch)" # We optionally need to skip checking for the presence of the metapackage # because that would pull in all the dependent toolset subrpms. We do not @@ -53,7 +54,7 @@ rlJournalStart rlLogInfo "(without skipped) COLLECTIONS=$COLLECTIONS" - rpm -q glibc-debuginfo &>/dev/null || rlRun 'debuginfo-install -y glibc' + rpm -q glibc-debuginfo.${ARCH} &>/dev/null || rlRun "debuginfo-install -y glibc.${ARCH}" rlAssertRpm --all