tests/annobin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Take patches into account when comparing the source tarball

Browse source 
The distributed source tarball for gcc must be modified by all
downstream patches applied because some of these patches may be needed
in order to fix bugs downstream.

Replace the previous code with another one based on "diff -r", which
compares the contents of the extracted tarball, ignoring modified times
of the files.
This commit is contained in:
Tulio Magno Quites Machado Filho 2025-03-11 16:28:27 -03:00
commit fcc973bd33
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Sanity/bz2067148-support_syncing_with_gcc/runtest.sh
View file

@ -107,14 +107,22 @@ rlJournalStart
rlPhaseEnd
rlPhaseStartTest SOURCES_ATTACHED
# annobin sources tarball should exist and match the SRPM's sources
# annobin sources tarball should exist and its contents should match
# SRPM's source + patches.
rlAssertExists "$SRC_TARBALL"
rlAssertNotDiffer "$SRC_TARBALL" "my_rpmbuild/SOURCES/annobin-${ANNOBIN_VERSION}.tar.xz"
rlRun "PrepDir=${PWD}/my_rpmbuild/BUILD/annobin-${ANNOBIN_VERSION}-build/annobin-${ANNOBIN_VERSION}"
rlAssertExists "${PrepDir}"
rlRun "TmpDir2=\$(mktemp -d)"
rlRun "pushd $TmpDir2"
rlRun "tar xaf $SRC_TARBALL"
rlRun "popd"
# Use diff in order to compare contents and not modified times of the files.
rlRun "diff -qr ${TmpDir2}/annobin-${ANNOBIN_VERSION} $PrepDir"
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -r $TmpDir"
rlRun "rm -r $TmpDir $TmpDir2"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd