diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2021-06-22 12:46:20 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2021-06-22 15:02:29 +0300 |
| commit | 90a333368ad7d928f020bbd8a3ad860f75cdee7a (patch) | |
| tree | a4746c4d751106fd8babc7824cb836b632a691ab | |
| parent | 81a940b79a323ca2d1fe614598d6194e22d2021e (diff) | |
| download | rpm-90a333368ad7d928f020bbd8a3ad860f75cdee7a.tar.gz | |
Revert "Make hardlink test independent of rpm version string"
This didn't actually cure the thing it was supposed to, and there are
more factors at play anyhow (libmagic strings and all).
This reverts commit 9db0b6fbc3636c8ac0e455fb15d717af5785e0fe.
(cherry picked from commit 8e2a488c914de99af81bf5076ae0768cba80a3dd)
| -rw-r--r-- | tests/rpmi.at | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/rpmi.at b/tests/rpmi.at index dfa386e59..00a7aa294 100644 --- a/tests/rpmi.at +++ b/tests/rpmi.at @@ -742,20 +742,18 @@ runroot rpmbuild \ -bb --quiet /data/SPECS/hlinktest.spec pkg="/build/RPMS/noarch/hlinktest-1.0-1.noarch.rpm" -# the offsets in the file depend on the version string length -vlen=$(runroot rpm -qp --qf "%{rpmversion}\n" "${pkg}" | wc -c) cp "${RPMTEST}/${pkg}" "${RPMTEST}/tmp/1.rpm" dd if=/dev/zero of="${RPMTEST}/tmp/1.rpm" \ - conv=notrunc bs=1 seek=$(expr 8172 + $vlen) count=6 2> /dev/null + conv=notrunc bs=1 seek=8180 count=6 2> /dev/null cp "${RPMTEST}/${pkg}" "${RPMTEST}/tmp/2.rpm" dd if=/dev/zero of="${RPMTEST}/tmp/2.rpm" \ - conv=notrunc bs=1 seek=$(expr 8142 + $vlen) count=6 2> /dev/null + conv=notrunc bs=1 seek=8150 count=6 2> /dev/null cp "${RPMTEST}/${pkg}" "${RPMTEST}/tmp/3.rpm" dd if=/dev/zero of="${RPMTEST}/tmp/3.rpm" \ - conv=notrunc bs=1 seek=$(expr 8042 + $vlen) count=6 2> /dev/null + conv=notrunc bs=1 seek=8050 count=6 2> /dev/null AT_CHECK([ RPMDB_INIT |