diff --git a/tests/rebuild-coreutils/runtest.sh b/tests/rebuild-coreutils/runtest.sh index 12c3992..eebd617 100755 --- a/tests/rebuild-coreutils/runtest.sh +++ b/tests/rebuild-coreutils/runtest.sh @@ -30,7 +30,7 @@ . /usr/share/beakerlib/beakerlib.sh || exit 1 PACKAGES="file rpm-build" -REQUIRES="${REQUIRES:-coreutils}" +TEST_PACKAGE="${TEST_PACKAGE:-coreutils}" TEST_USER="${TEST_USER:-jouda}" rlJournalStart @@ -40,10 +40,10 @@ rlJournalStart rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "pushd \$TmpDir" - rlRun "dnf -y update coreutils" 0-255 - rlRun "rlFetchSrcForInstalled coreutils" - rlRun "SRPM=\$(find . -name 'coreutils-*.src.rpm')" + rlRun "dnf install -y $TEST_PACKAGE" + rlRun "rlFetchSrcForInstalled $TEST_PACKAGE" + rlRun "SRPM=\$(find . -name '$TEST_PACKAGE-*.src.rpm')" rlRun "dnf builddep -y $SRPM" rlRun "userdel -r $TEST_USER" 0,6 @@ -53,13 +53,13 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest - rlRun "su - $TEST_USER -c 'rpmbuild -ba --clean --nocheck \$(rpm --eval=%_specdir)/coreutils.spec'" + rlRun "su - $TEST_USER -c 'rpmbuild -ba --clean --nocheck \$(rpm --eval=%_specdir)/$TEST_PACKAGE.spec'" rlPhaseEnd - rlPhaseStartCleanup - rlRun "userdel -r $TEST_USER" - rlRun "popd" - rlRun "rm -r \$TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText + rlPhaseStartCleanup + rlRun "userdel -r $TEST_USER" + rlRun "popd" + rlRun "rm -r \$TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +lJournalPrintText rlJournalEnd