More precise setup in the #1311352 CI test
This commit is contained in:
parent
eb66e6ad98
commit
37d46f62b4
@ -11,7 +11,6 @@ recommend:
|
|||||||
- binutils
|
- binutils
|
||||||
- strace
|
- strace
|
||||||
- nscd
|
- nscd
|
||||||
- glibc-debuginfo
|
|
||||||
duration: 15m
|
duration: 15m
|
||||||
extra-summary: /tools/binutils/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow
|
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
|
extra-task: /tools/binutils/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow
|
||||||
|
@ -39,6 +39,7 @@ rlJournalStart
|
|||||||
rlLogInfo "REQUIRES=$REQUIRES"
|
rlLogInfo "REQUIRES=$REQUIRES"
|
||||||
rlLogInfo "COLLECTIONS=$COLLECTIONS"
|
rlLogInfo "COLLECTIONS=$COLLECTIONS"
|
||||||
rlLogInfo "SKIP_COLLECTION_METAPACKAGE_CHECK=$SKIP_COLLECTION_METAPACKAGE_CHECK"
|
rlLogInfo "SKIP_COLLECTION_METAPACKAGE_CHECK=$SKIP_COLLECTION_METAPACKAGE_CHECK"
|
||||||
|
rlRun "ARCH=$(arch)"
|
||||||
|
|
||||||
# We optionally need to skip checking for the presence of the metapackage
|
# 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
|
# because that would pull in all the dependent toolset subrpms. We do not
|
||||||
@ -53,7 +54,7 @@ rlJournalStart
|
|||||||
|
|
||||||
rlLogInfo "(without skipped) COLLECTIONS=$COLLECTIONS"
|
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
|
rlAssertRpm --all
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user