Improve rpm-rebuild test
Cleanup rpmbuild directory after test. Minor code cleaning.
This commit is contained in:
parent
e071728eed
commit
0bb39d1c34
1 changed files with 13 additions and 10 deletions
|
|
@ -2,15 +2,16 @@
|
|||
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
PACKAGE="$(rpm -qf $(which rustc))"
|
||||
PACKAGE="$(rpm -qf "$(which rustc)")"
|
||||
|
||||
rlJournalStart
|
||||
rlPhaseStartSetup
|
||||
rlAssertRpm $PACKAGE || rlDie "rustc not found. Aborting testcase..."
|
||||
declare TmpDir
|
||||
rlAssertRpm "$PACKAGE" || rlDie "rustc not found. Aborting testcase..."
|
||||
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
|
||||
rlRun "pushd $TmpDir"
|
||||
|
||||
if [[ "x" == "x${PKG_TO_BUILD}" ]]; then
|
||||
if [[ -z "${PKG_TO_BUILD}" ]]; then
|
||||
rlLogError "No package was configured to build."
|
||||
rlDie "The package must be passed over PKG_TO_BUILD environment variable."
|
||||
fi
|
||||
|
|
@ -19,26 +20,27 @@ rlJournalStart
|
|||
# out of space, timeouts, or OOMs this will help identifying where
|
||||
# the issue might be.
|
||||
rlRun "free -h" 0 "Available memory"
|
||||
rlRun 'echo "Processing units: $(nproc)"' 0 "Show processing units"
|
||||
rlRun "echo \"Processing units: $(nproc)\"" 0 "Show processing units"
|
||||
rlRun "df -h" 0 "Storage space"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStart FAIL ${PKG_TO_BUILD}FetchSrcAndInstallBuildDeps
|
||||
if ! rlCheckRpm $PKG_TO_BUILD; then
|
||||
rlPhaseStart FAIL "${PKG_TO_BUILD}"FetchSrcAndInstallBuildDeps
|
||||
if ! rlCheckRpm "$PKG_TO_BUILD"; then
|
||||
rlRun "yum install -y $PKG_TO_BUILD ${YUM_SWITCHES}"
|
||||
rlAssertRpm $PKG_TO_BUILD
|
||||
rlAssertRpm "$PKG_TO_BUILD"
|
||||
fi
|
||||
rlFetchSrcForInstalled $PKG_TO_BUILD
|
||||
rlRun SRPM=$(ls -1 *.src.rpm)
|
||||
rlFetchSrcForInstalled "$PKG_TO_BUILD"
|
||||
rlRun SRPM="$(ls -1 ./*.src.rpm)"
|
||||
rlRun "rpm -ivh $SRPM"
|
||||
rlRun SPECDIR="$(rpm -E '%{_specdir}')"
|
||||
rlRun TOPDIR="$(rpm -E '%{_topdir}')"
|
||||
# Note about the spec file name: When packaging rust crates, the package
|
||||
# is named rust-<crate>, as well as the spec file, but the rpm package
|
||||
# (the one we use in dnf to install and query) is named as the crate,
|
||||
# (without the "rust-" prefix). We have to take that into account to
|
||||
# find the spec:
|
||||
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Rust/#_package_naming
|
||||
rlRun "SPECNAME=$(rpm -ql $SRPM | grep .spec)"
|
||||
rlRun "SPECNAME=$(rpm -ql "$SRPM" | grep .spec)"
|
||||
|
||||
# Packages built with rust usually contains dynamic dependencies.
|
||||
# builddep needs to be run from the srpm, not the spec file, to be able
|
||||
|
|
@ -56,6 +58,7 @@ rlJournalStart
|
|||
rlPhaseStartCleanup
|
||||
rlRun "popd"
|
||||
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
|
||||
rlRun "rm -r $TOPDIR" 0 "Remove rpmbuild directory"
|
||||
rlPhaseEnd
|
||||
rlJournalPrintText
|
||||
rlJournalEnd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue