On Tue, Aug 23, 2016 at 03:19:17PM +0200, Mark Wielaard wrote:
> Hi Michal,
>
> On Sun, 2016-08-14 at 22:33 +0200, Michal Marek wrote:
> > Note that I'm still planning to submit the rebased patch series. But I'm
> > having issues with the tests in rpmbuild.at and rpmbuildid.at, both with
> > and without my patches, so I can't verify the patches.
>
> What kind of failures do you see? The testcases PASS on my setup, but to
> get zero FAIL I do need to set my hostname to "localhost" and use a
> specific old version of fakechroot (2.9-32.fc21 installed on my Fedora
> 24 system).
I actually fixed some of the issues with fakechroot, see the attached
patch. But it regressed in 2.17, so that opendir(".") no longer works.
Thanks for the hint with the hostname, I'll try it and hopefully send
the rebased find-debuginfo series soon.
Michal
>From 4fa092f76124863f1e2bece5dec2c4ef17087c94 Mon Sep 17 00:00:00 2001
From: Michal Marek <mma...@suse.com>
Date: Fri, 12 Aug 2016 21:47:16 +0200
Subject: [PATCH] tests: Do not pass real pathnames to fakechroot commands
Fakechroot returns -ENOENT for such paths:
$ FAKECHROOT_BASE=$PWD/tests/testing fakechroot ls /not_an.rpm
/not_an.rpm
$ FAKECHROOT_BASE=$PWD/tests/testing fakechroot ls $PWD/not_an.rpm
ls: cannot access /home/mmarek/GIT/rpm/not_an.rpm: No such file or directory
Signed-off-by: Michal Marek <mma...@suse.com>
---
tests/atlocal.in | 2 +-
tests/rpmbuild.at | 10 +++----
tests/rpmconfig.at | 58 +++++++++++++++++++-------------------
tests/rpmconfig2.at | 48 ++++++++++++++++----------------
tests/rpmconfig3.at | 40 +++++++++++++--------------
tests/rpmconflict.at | 20 +++++++-------
tests/rpmdb.at | 8 +++---
tests/rpmdeps.at | 26 +++++++++---------
tests/rpmi.at | 44 ++++++++++++++---------------
tests/rpmreplace.at | 78 ++++++++++++++++++++++++++--------------------------
tests/rpmscript.at | 32 ++++++++++-----------
tests/rpmverify.at | 8 +++---
12 files changed, 187 insertions(+), 187 deletions(-)
diff --git a/tests/atlocal.in b/tests/atlocal.in
index c2a07d566a32..9296987259a3 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -29,7 +29,7 @@ function run()
function runroot()
{
- (cd ${RPMTEST} && \
+ (unset RPM_CONFIGDIR RPM_POPTEXEC_PATH; cd ${RPMTEST} && \
MAGIC="/magic/magic" FAKECHROOT_BASE="${RPMTEST}" fakechroot "$@" --define "_topdir /build" --noplugins
)
}
diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at
index e376d29df2f4..0a2c01efee0b 100644
--- a/tests/rpmbuild.at
+++ b/tests/rpmbuild.at
@@ -95,7 +95,7 @@ runroot rpmbuild \
runroot rpm -qp --qf \
"\n[%{filemodes:perms} %-8{fileusername} %-8{filegroupname} %{filenames}\n]"\
- "${TOPDIR}"/RPMS/noarch/attrtest-1.0-1.noarch.rpm
+ /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
]],
[0],
[
@@ -135,7 +135,7 @@ rm -rf ${TOPDIR}
runroot rpmbuild \
-bb --quiet /data/SPECS/hlinktest.spec
-runroot rpm -i "${TOPDIR}"/RPMS/noarch/hlinktest-1.0-1.noarch.rpm
+runroot rpm -i /build/RPMS/noarch/hlinktest-1.0-1.noarch.rpm
runroot rpm -q --qf "[[%{filenlinks} %{filenames}\n]]%{longsize}\n" hlinktest
runroot rpm -V --nouser --nogroup hlinktest
@@ -166,7 +166,7 @@ rm -rf ${TOPDIR}
runroot rpmbuild -bb --quiet /data/SPECS/globtest.spec
runroot rpm -qp \
--qf "[[%{filemodes:perms} %{filenames}\n]]" \
- "${TOPDIR}"/RPMS/noarch/globtest-1.0-1.noarch.rpm
+ /build/RPMS/noarch/globtest-1.0-1.noarch.rpm
],
[0],
[-rw-r--r-- /opt/globtest/baf
@@ -199,7 +199,7 @@ runroot rpmbuild -bb --quiet \
/data/SPECS/prefixtest.spec
runroot rpm -qp \
--qf "[[%{filemodes:perms} %{filenames}\n]]" \
- "${TOPDIR}"/RPMS/noarch/prefixtest-1.0-1.noarch.rpm
+ /build/RPMS/noarch/prefixtest-1.0-1.noarch.rpm
],
[0],
[-rw-r--r-- /opt/prefixtest/ba
@@ -298,7 +298,7 @@ runroot rpmbuild \
-bb --quiet /data/SPECS/attrtest.spec
runroot rpm2cpio \
- "${TOPDIR}"/RPMS/noarch/attrtest-1.0-1.noarch.rpm > /tmp/attrtest.cpio
+ /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm > /tmp/attrtest.cpio
],
[0],
[],
diff --git a/tests/rpmconfig.at b/tests/rpmconfig.at
index 91c03ba571bc..56437748adc5 100644
--- a/tests/rpmconfig.at
+++ b/tests/rpmconfig.at
@@ -18,7 +18,7 @@ runroot rpmbuild --quiet -bb \
/data/SPECS/configtest.spec
echo "otherstuff" > "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
runroot rpm -e configtest
cat "${cf}.rpmorig"
@@ -47,7 +47,7 @@ runroot rpmbuild --quiet -bb \
/data/SPECS/configtest.spec
echo "otherstuff" > "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
runroot rpm -e configtest
cat "${cf}.rpmorig"
@@ -76,7 +76,7 @@ runroot rpmbuild --quiet -bb \
/data/SPECS/configtest.spec
echo "foo" > "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
runroot rpm -e configtest
test ! -f "${cf}"
@@ -102,7 +102,7 @@ runroot rpmbuild --quiet -bb \
--define "filedata foo" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
runroot rpm -e configtest
test ! -f "${cf}"
@@ -128,7 +128,7 @@ runroot rpmbuild --quiet -bb \
--define "filedata foo" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "otherstuff" > "${cf}"
runroot rpm -e configtest
@@ -159,7 +159,7 @@ runroot rpmbuild --quiet -bb \
--define "noreplace 1" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "otherstuff" > "${cf}"
runroot rpm -e configtest
@@ -192,9 +192,9 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -222,11 +222,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "otherstuff" > "${cf}"
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -255,9 +255,9 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -285,11 +285,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "otherstuff" > "${RPMTEST}"/etc/my.conf
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
cat "${cf}.rpmsave"
],
@@ -321,11 +321,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "foo-2.0" > "${RPMTEST}"/etc/my.conf
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -357,9 +357,9 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -389,11 +389,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "otherstuff" > "${cf}"
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -423,9 +423,9 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -454,11 +454,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "otherstuff" > "${RPMTEST}"/etc/my.conf
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
cat "${cf}.rpmnew"
],
@@ -491,11 +491,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "foo-2.0" > "${RPMTEST}"/etc/my.conf
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -815,18 +815,18 @@ done
test ! -f "${cf}" && echo OK1
echo "keaton" > "${cf}"
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
runroot rpm -e configtest
cat "${cf}"
rm -f "${cf}"
# post-install config, upgrade, erase
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
test ! -f "${cf}" && echo OK2
echo "buster" > "${cf}"
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
runroot rpm -e configtest
cat "${cf}"
diff --git a/tests/rpmconfig2.at b/tests/rpmconfig2.at
index 04053a1afb78..e6fa39a3d2c8 100644
--- a/tests/rpmconfig2.at
+++ b/tests/rpmconfig2.at
@@ -19,7 +19,7 @@ runroot rpmbuild --quiet -bb \
/data/SPECS/configtest.spec
ln -s "otherstuff" "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
runroot rpm -e configtest
readlink "${cf}.rpmorig"
@@ -50,7 +50,7 @@ runroot rpmbuild --quiet -bb \
ln -s "foo" "${cf}"
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
runroot rpm -e configtest
test ! -L "${cf}"
@@ -78,7 +78,7 @@ runroot rpmbuild --quiet -bb \
--define "filetype link" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
runroot rpm -e configtest
test ! -L "${cf}"
@@ -105,7 +105,7 @@ runroot rpmbuild --quiet -bb \
--define "filetype link" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
ln -sf "otherstuff" "${cf}"
runroot rpm -e configtest
@@ -138,9 +138,9 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
],
[0],
@@ -170,11 +170,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
ln -sf "otherstuff" "${cf}"
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
],
[0],
@@ -204,9 +204,9 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
],
[0],
@@ -235,11 +235,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
ln -sf "otherstuff" "${cf}"
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
readlink "${cf}.rpmsave"
],
@@ -272,11 +272,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
ln -sf "foo-2.0" "${cf}"
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
],
[0],
@@ -309,9 +309,9 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
],
[0],
@@ -342,11 +342,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
ln -sf "otherstuff" "${cf}"
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
],
[0],
@@ -377,9 +377,9 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
],
[0],
@@ -409,11 +409,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
ln -sf "otherstuff" "${cf}"
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
readlink "${cf}.rpmnew"
],
@@ -447,11 +447,11 @@ for v in "1.0" "2.0"; do
/data/SPECS/configtest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
ln -sf "foo-2.0" "${cf}"
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
test ! -L "${cf}.rpmnew"
],
diff --git a/tests/rpmconfig3.at b/tests/rpmconfig3.at
index 5a32c0c3474f..db2e44e17fb8 100644
--- a/tests/rpmconfig3.at
+++ b/tests/rpmconfig3.at
@@ -25,11 +25,11 @@ runroot rpmbuild --quiet -bb \
--define "noconfig 1" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
-runroot rpm -U --oldpackage "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U --oldpackage /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -63,14 +63,14 @@ runroot rpmbuild --quiet -bb \
--define "noconfig 1" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "otherstuff" > "${cf}"
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
cat "${cf}.rpmsave"
-runroot rpm -U --oldpackage "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U --oldpackage /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -107,13 +107,13 @@ runroot rpmbuild --quiet -bb \
--define "noconfig 1" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "bar" > "${cf}"
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
-runroot rpm -U --oldpackage "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U --oldpackage /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -147,11 +147,11 @@ runroot rpmbuild --quiet -bb \
--define "filedata bar" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
-runroot rpm -U --oldpackage "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U --oldpackage /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
],
[0],
@@ -184,11 +184,11 @@ runroot rpmbuild --quiet -bb \
--define "filedata bar" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "otherstuff" > "${cf}"
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
readlink "${cf}"
cat "${cf}.rpmsave"
],
@@ -224,11 +224,11 @@ runroot rpmbuild --quiet -bb \
--define "filedata bar" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
readlink "${cf}"
ln -sf "otherstuff" "${cf}"
readlink "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
cat "${cf}"
readlink "${cf}.rpmsave"
],
@@ -263,9 +263,9 @@ runroot rpmbuild --quiet -bb \
--define "filetype dir" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
test -d "${cf}"
],
[0],
@@ -295,11 +295,11 @@ runroot rpmbuild --quiet -bb \
--define "filetype dir" \
/data/SPECS/configtest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
echo "otherstuff" > "${cf}"
cat "${cf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/configtest-2.0-1.noarch.rpm
test -d "${cf}"
cat "${cf}.rpmsave"
],
diff --git a/tests/rpmconflict.at b/tests/rpmconflict.at
index c9329e2b9cb3..f3e9f5a1400b 100644
--- a/tests/rpmconflict.at
+++ b/tests/rpmconflict.at
@@ -18,8 +18,8 @@ for p in "one" "two"; do
/data/SPECS/conflicttest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/conflictone-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/conflictone-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm
],
[1],
[ignore],
@@ -59,8 +59,8 @@ for p in "one" "two"; do
/data/SPECS/conflicttest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/conflictone-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/conflictone-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm
],
[0],
[ignore],
@@ -95,7 +95,7 @@ rm -rf "${TOPDIR}"
runroot rpmbuild --quiet -bb /data/SPECS/selfconflict.spec
rm -rf "${RPMTEST}"/opt/mydir
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/selfconflict-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/selfconflict-1.0-1.noarch.rpm
],
[0],
[],
@@ -115,7 +115,7 @@ runroot rpmbuild --quiet -bb /data/SPECS/selfconflict.spec
rm -rf "${RPMTEST}"/opt/mydir
mkdir -p "${RPMTEST}"/opt/mydir/one
ln -s one "${RPMTEST}"/opt/mydir/two
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/selfconflict-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/selfconflict-1.0-1.noarch.rpm
],
[1],
[],
@@ -361,8 +361,8 @@ runroot rpmbuild --quiet -bb \
runroot rpmbuild --quiet -bb \
--define "rel 2" --with symlink /data/SPECS/symlinktest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/symlinktest-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/symlinktest-1.0-2.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/symlinktest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/symlinktest-1.0-2.noarch.rpm
],
[2],
[],
@@ -385,8 +385,8 @@ runroot rpmbuild --quiet -bb \
runroot rpmbuild --quiet -bb \
--define "rel 2" --without symlink /data/SPECS/symlinktest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/symlinktest-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/symlinktest-1.0-2.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/symlinktest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/symlinktest-1.0-2.noarch.rpm
],
[2],
[],
diff --git a/tests/rpmdb.at b/tests/rpmdb.at
index f1e6c3e9ab2c..3fd2974fcb15 100644
--- a/tests/rpmdb.at
+++ b/tests/rpmdb.at
@@ -243,7 +243,7 @@ runroot rpmbuild --quiet -bb \
--define "filedata same_stuff" \
/data/SPECS/conflicttest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/conflictstatus-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/conflictstatus-1.0-1.noarch.rpm
runroot rpm -qls conflictstatus
],
[0],
@@ -264,7 +264,7 @@ rm -rf "${TOPDIR}"
runroot rpmbuild --quiet -bb \
/data/SPECS/flangtest.spec
-runroot rpm -U --define "_install_langs de:fi" "${TOPDIR}"/RPMS/noarch/flangtest-1.0-1.noarch.rpm
+runroot rpm -U --define "_install_langs de:fi" /build/RPMS/noarch/flangtest-1.0-1.noarch.rpm
runroot rpm -qls flangtest
],
[0],
@@ -289,7 +289,7 @@ rm -rf "${TOPDIR}"
rm -rf "${RPMTEST}"/opt/*
runroot rpmbuild --quiet -bb /data/SPECS/selfconflict.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/selfconflict-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/selfconflict-1.0-1.noarch.rpm
find "${RPMTEST}"/opt | wc -l
],
[0],
@@ -310,7 +310,7 @@ rm -rf "${TOPDIR}"
rm -rf "${RPMTEST}"/opt/*
runroot rpmbuild --quiet -bb /data/SPECS/selfconflict.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/selfconflict-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/selfconflict-1.0-1.noarch.rpm
runroot rpm -e selfconflict
find "${RPMTEST}"/opt | wc -l
],
diff --git a/tests/rpmdeps.at b/tests/rpmdeps.at
index 5f08e626bc33..824688b4acf0 100644
--- a/tests/rpmdeps.at
+++ b/tests/rpmdeps.at
@@ -16,7 +16,7 @@ runroot rpmbuild --quiet -bb \
--define "reqs deptest-two" \
/data/SPECS/deptest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
],
[1],
[],
@@ -44,7 +44,7 @@ runroot rpmbuild --quiet -bb \
--define "reqs deptest-one" \
/data/SPECS/deptest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
+runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
],
[0],
[],
@@ -70,7 +70,7 @@ runroot rpmbuild --quiet -bb \
--define "provs deptest-foo = 1.0" \
/data/SPECS/deptest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
+runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
],
[2],
[],
@@ -98,7 +98,7 @@ runroot rpmbuild --quiet -bb \
--define "provs deptest-foo = 2.0" \
/data/SPECS/deptest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
+runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
],
[0],
[],
@@ -123,7 +123,7 @@ runroot rpmbuild --quiet -bb \
--define "pkg two" \
/data/SPECS/deptest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
+runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
],
[2],
[],
@@ -150,8 +150,8 @@ runroot rpmbuild --quiet -bb \
--define "pkg two" \
/data/SPECS/deptest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
],
[1],
[],
@@ -173,7 +173,7 @@ runroot rpmbuild --quiet -bb \
--define "cfls something" \
/data/SPECS/deptest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
runroot rpm -V --nofiles deptest-one
],
[0],
@@ -201,12 +201,12 @@ runroot rpmbuild --quiet -bb \
runroot rpm -U --test \
"${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm \
"${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
runroot rpm -e deptest-one
# XXX FIXME: rpm's problem message for this case is higly bogus.
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
runroot rpm -e deptest-two
],
[],
@@ -238,7 +238,7 @@ runroot rpmbuild --quiet -bb \
--define "provs deptest-foo = 2.0" \
/data/SPECS/deptest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
+runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
runroot rpm -e deptest-two
],
[1],
diff --git a/tests/rpmi.at b/tests/rpmi.at
index 674276193097..2fd7d5b5dc2e 100644
--- a/tests/rpmi.at
+++ b/tests/rpmi.at
@@ -111,8 +111,8 @@ for v in "1.0" "2.0"; do
/data/SPECS/versiontest.spec
done
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/versiontest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/versiontest-2.0-1.noarch.rpm
runroot rpm -q versiontest
],
[0],
@@ -127,8 +127,8 @@ AT_CHECK([
RPMDB_CLEAR
RPMDB_INIT
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/versiontest-2.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/versiontest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm
],
[2],
[],
@@ -142,8 +142,8 @@ AT_CHECK([
RPMDB_CLEAR
RPMDB_INIT
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/versiontest-2.0-1.noarch.rpm
-runroot rpm -U --oldpackage "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/versiontest-2.0-1.noarch.rpm
+runroot rpm -U --oldpackage /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm
runroot rpm -q versiontest
],
[0],
@@ -159,8 +159,8 @@ RPMDB_CLEAR
RPMDB_INIT
runroot rpm -Uv \
- "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm \
- "${TOPDIR}"/RPMS/noarch/versiontest-2.0-1.noarch.rpm
+ /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/versiontest-2.0-1.noarch.rpm
runroot rpm -q versiontest
],
[0],
@@ -179,8 +179,8 @@ RPMDB_CLEAR
RPMDB_INIT
runroot rpm -Uv \
- "${TOPDIR}"/RPMS/noarch/versiontest-2.0-1.noarch.rpm \
- "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm
+ /build/RPMS/noarch/versiontest-2.0-1.noarch.rpm \
+ /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm
runroot rpm -q versiontest
],
[0],
@@ -208,8 +208,8 @@ runroot rpmbuild --quiet -bb \
runroot rpm -Uv \
- "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm \
- "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+ /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
runroot rpm -q deptest-one
],
[0],
@@ -237,8 +237,8 @@ runroot rpmbuild --quiet -bb \
runroot rpm -Uv \
- "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm \
- "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
+ /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
runroot rpm -q deptest-one
],
[0],
@@ -257,8 +257,8 @@ RPMDB_CLEAR
RPMDB_INIT
runroot rpm -i \
- "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm \
- "${TOPDIR}"/RPMS/noarch/versiontest-2.0-1.noarch.rpm
+ /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/versiontest-2.0-1.noarch.rpm
runroot rpm -q versiontest
],
[0],
@@ -276,8 +276,8 @@ RPMDB_CLEAR
RPMDB_INIT
runroot rpm -i \
- "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm \
- "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm
+ /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm
runroot rpm -q versiontest
],
[0],
@@ -297,7 +297,7 @@ RPMDB_INIT
runroot rpmbuild --quiet -bb /data/SPECS/hello-script.spec
runroot rpm -U --test --ignoreos --relocate /usr=/opt \
- "${TOPDIR}"/RPMS/noarch/hello-script-1.0-1.noarch.rpm
+ /build/RPMS/noarch/hello-script-1.0-1.noarch.rpm
],
[1],
[],
@@ -314,7 +314,7 @@ RPMDB_INIT
runroot rpmbuild --quiet -bb /data/SPECS/hello-script.spec
runroot rpm -U --test --ignoreos --badreloc --relocate /usr=/opt \
- "${TOPDIR}"/RPMS/noarch/hello-script-1.0-1.noarch.rpm
+ /build/RPMS/noarch/hello-script-1.0-1.noarch.rpm
],
[0],
[],
@@ -330,7 +330,7 @@ RPMDB_INIT
runroot rpmbuild --quiet -bb /data/SPECS/testdoc.spec
runroot rpm -i --excludedocs \
- "${TOPDIR}"/RPMS/noarch/testdoc-1.0-1.noarch.rpm
+ /build/RPMS/noarch/testdoc-1.0-1.noarch.rpm
RPM_DOCDIR=$(runroot rpm --eval '%_defaultdocdir')
RPM_DATADIR=$(runroot rpm --eval '%_datadir')
@@ -341,7 +341,7 @@ test -e ${RPMTEST}${RPM_DATADIR}/testdoc/nodoc || exit 1
runroot rpm -e testdoc
runroot rpm -i \
- "${TOPDIR}"/RPMS/noarch/testdoc-1.0-1.noarch.rpm
+ /build/RPMS/noarch/testdoc-1.0-1.noarch.rpm
test -e ${RPMTEST}${RPM_DOCDIR}/testdoc/documentation1 || exit 1
test -e ${RPMTEST}${RPM_DOCDIR}/testdoc/documentation2 || exit 1
test -e ${RPMTEST}${RPM_DOCDIR}/testdoc/examples/example1 || exit 1
diff --git a/tests/rpmreplace.at b/tests/rpmreplace.at
index cdc8d03d9bec..d87c28c93511 100644
--- a/tests/rpmreplace.at
+++ b/tests/rpmreplace.at
@@ -22,11 +22,11 @@ runroot rpmbuild --quiet -bb \
--define "filedata bar" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
cat "${tf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
cat "${tf}"
-runroot rpm -U --oldpackage "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U --oldpackage /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
cat "${tf}"
],
[0],
@@ -58,11 +58,11 @@ runroot rpmbuild --quiet -bb \
--define "filedata stuff" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
cat "${tf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
readlink "${tf}"
-runroot rpm -U --oldpackage "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U --oldpackage /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
cat "${tf}"
],
[0],
@@ -94,11 +94,11 @@ runroot rpmbuild --quiet -bb \
--define "filedata goo" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
cat "${tf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
readlink "${tf}"
-runroot rpm -U --oldpackage "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U --oldpackage /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
cat "${tf}"
],
[0],
@@ -130,9 +130,9 @@ runroot rpmbuild --quiet -bb \
--define "filedata stuff" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
readlink "${tf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
readlink "${tf}"
],
[0],
@@ -163,9 +163,9 @@ runroot rpmbuild --quiet -bb \
--define "filedata goo" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
readlink "${tf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
readlink "${tf}"
],
[0],
@@ -196,9 +196,9 @@ runroot rpmbuild --quiet -bb \
--define "filedata zoo" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
readlink "${tf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
readlink "${tf}"
],
[0],
@@ -228,9 +228,9 @@ runroot rpmbuild --quiet -bb \
--define "filetype dir" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
cat "${tf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
test -d "${tf}"
],
[0],
@@ -259,9 +259,9 @@ runroot rpmbuild --quiet -bb \
--define "filetype dir" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
readlink "${tf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
test -d "${tf}"
],
[0],
@@ -290,9 +290,9 @@ runroot rpmbuild --quiet -bb \
--define "filetype dir" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
readlink "${tf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
test -d "${tf}"
],
[0],
@@ -321,9 +321,9 @@ runroot rpmbuild --quiet -bb \
--define "filetype dir" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
readlink "${tf}"
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
],
[2],
[zoo
@@ -351,8 +351,8 @@ runroot rpmbuild --quiet -bb \
--define "filetype dir" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
-test -d "${tf}" && runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+test -d "${tf}" && runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
test -d "${tf}"
],
[0],
@@ -380,8 +380,8 @@ runroot rpmbuild --quiet -bb \
--define "filedata woot" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
-test -d "${tf}" && runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+test -d "${tf}" && runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
],
[2],
[],
@@ -412,8 +412,8 @@ runroot rpmbuild --quiet -bb \
mkdir "${RPMTEST}"/opt/f00f
ln -s f00f "${RPMTEST}"/opt/foo
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
-test -L "${tf}" && test -d "${tf}" && runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+test -L "${tf}" && test -d "${tf}" && runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
test -L "${tf}" && test -d "${tf}"
],
[0],
@@ -441,8 +441,8 @@ runroot rpmbuild --quiet -bb \
--define "filedata woot" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
-test -d "${tf}" && runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+test -d "${tf}" && runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
],
[2],
[],
@@ -470,8 +470,8 @@ runroot rpmbuild --quiet -bb \
--define "filedata woot" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
-test -d "${tf}" && runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+test -d "${tf}" && runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
],
[2],
[],
@@ -499,8 +499,8 @@ runroot rpmbuild --quiet -bb \
--define "filedata goo" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
-test -d "${tf}" && rmdir "${tf}" && runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+test -d "${tf}" && rmdir "${tf}" && runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
readlink "${tf}"
],
[0],
@@ -529,8 +529,8 @@ runroot rpmbuild --quiet -bb \
--define "filedata goo" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
-test -d "${tf}" && rmdir "${tf}" && ln -sf goo "${tf}" && runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+test -d "${tf}" && rmdir "${tf}" && ln -sf goo "${tf}" && runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
readlink "${tf}"
],
[0],
@@ -560,8 +560,8 @@ runroot rpmbuild --quiet -bb \
--define "fixit posix.rmdir('/opt/foo')" \
/data/SPECS/replacetest.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-1.0-1.noarch.rpm
-test -d "${tf}" && runroot rpm -U --test "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm && runroot rpm -U "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
+test -d "${tf}" && runroot rpm -U --test "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm && runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
readlink "${tf}"
],
[0],
diff --git a/tests/rpmscript.at b/tests/rpmscript.at
index a6068953c86c..6c1b815e56d1 100644
--- a/tests/rpmscript.at
+++ b/tests/rpmscript.at
@@ -15,10 +15,10 @@ runroot rpmbuild --quiet -bb /data/SPECS/fakeshell.spec
runroot rpmbuild --quiet -bb --define "rel 1" /data/SPECS/scripts.spec
runroot rpmbuild --quiet -bb --define "rel 2" /data/SPECS/scripts.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/fakeshell-1.0-1.noarch.rpm
-runroot rpm -Vvp "${TOPDIR}"/RPMS/noarch/scripts-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/scripts-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/scripts-1.0-2.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/fakeshell-1.0-1.noarch.rpm
+runroot rpm -Vvp /build/RPMS/noarch/scripts-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/scripts-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/scripts-1.0-2.noarch.rpm
runroot rpm -Vv scripts
runroot rpm -e scripts
],
@@ -54,15 +54,15 @@ runroot rpmbuild --quiet -bb --define "rel 2" /data/SPECS/scripts.spec
runroot rpmbuild --quiet -bb --define "rel 1" --define "trigpkg scripts" /data/SPECS/triggers.spec
runroot rpmbuild --quiet -bb --define "rel 2" --define "trigpkg scripts" /data/SPECS/triggers.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/fakeshell-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/fakeshell-1.0-1.noarch.rpm
echo TRIGGERS 1
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/triggers-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/triggers-1.0-1.noarch.rpm
echo SCRIPTS 1
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/scripts-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/scripts-1.0-1.noarch.rpm
echo SCRIPTS 2
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/scripts-1.0-2.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/scripts-1.0-2.noarch.rpm
echo TRIGGERS 2
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/triggers-1.0-2.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/triggers-1.0-2.noarch.rpm
echo ERASE
runroot rpm -e scripts
],
@@ -111,10 +111,10 @@ runroot rpmbuild --quiet -bb /data/SPECS/hello-script.spec
runroot rpmbuild --quiet -bb /data/SPECS/hlinktest.spec
runroot rpmbuild --quiet -bb /data/SPECS/filetriggers.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/fakeshell-1.0-1.noarch.rpm
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/filetriggers-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/fakeshell-1.0-1.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/filetriggers-1.0-1.noarch.rpm
echo INSTALLATION
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/hello-script-1.0-1.noarch.rpm \
+runroot rpm -U /build/RPMS/noarch/hello-script-1.0-1.noarch.rpm \
"${TOPDIR}"/RPMS/noarch/hlinktest-1.0-1.noarch.rpm
echo ERASE
runroot rpm -e hello-script hlinktest
@@ -215,10 +215,10 @@ runroot rpmbuild --quiet -bb /data/SPECS/fakeshell.spec
runroot rpmbuild --quiet -bb --define "rel 1" /data/SPECS/scripts-nice-ionice.spec
runroot rpmbuild --quiet -bb --define "rel 2" /data/SPECS/scripts-nice-ionice.spec
-runroot rpm -U "${TOPDIR}"/RPMS/noarch/fakeshell-1.0-1.noarch.rpm
-runroot nice -n 10 ionice -c3 rpm -Vvp "${TOPDIR}"/RPMS/noarch/scripts-nice-ionice-1.0-1.noarch.rpm
-runroot nice -n 10 ionice -c3 rpm -U "${TOPDIR}"/RPMS/noarch/scripts-nice-ionice-1.0-1.noarch.rpm
-runroot nice -n 10 ionice -c3 rpm -U "${TOPDIR}"/RPMS/noarch/scripts-nice-ionice-1.0-2.noarch.rpm
+runroot rpm -U /build/RPMS/noarch/fakeshell-1.0-1.noarch.rpm
+runroot nice -n 10 ionice -c3 rpm -Vvp /build/RPMS/noarch/scripts-nice-ionice-1.0-1.noarch.rpm
+runroot nice -n 10 ionice -c3 rpm -U /build/RPMS/noarch/scripts-nice-ionice-1.0-1.noarch.rpm
+runroot nice -n 10 ionice -c3 rpm -U /build/RPMS/noarch/scripts-nice-ionice-1.0-2.noarch.rpm
runroot nice -n 10 ionice -c3 rpm -Vv scripts-nice-ionice
runroot nice -n 10 ionice -c3 rpm -e scripts-nice-ionice
],
diff --git a/tests/rpmverify.at b/tests/rpmverify.at
index 2c2cfb706d58..cf7abc3fa96a 100644
--- a/tests/rpmverify.at
+++ b/tests/rpmverify.at
@@ -16,7 +16,7 @@ runroot rpmbuild --quiet -bb \
--define "reqs deptest-two" \
/data/SPECS/deptest.spec
-runroot rpm -U --nodeps "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+runroot rpm -U --nodeps /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
runroot rpm -Va --nofiles
],
[1],
@@ -139,7 +139,7 @@ RPMDB_INIT
rm -rf "${TOPDIR}"
runroot rpmbuild --quiet -bb /data/SPECS/verifyscript.spec
-runroot rpm -U --nodeps "${TOPDIR}"/RPMS/noarch/verifyscript-1.0-1.noarch.rpm
+runroot rpm -U --nodeps /build/RPMS/noarch/verifyscript-1.0-1.noarch.rpm
rm -f "${RPMTEST}"/var/checkme
runroot rpm -V --nodeps verifyscript
],
@@ -156,7 +156,7 @@ RPMDB_INIT
rm -rf "${TOPDIR}"
runroot rpmbuild --quiet -bb /data/SPECS/verifyscript.spec
-runroot rpm -U --nodeps "${TOPDIR}"/RPMS/noarch/verifyscript-1.0-1.noarch.rpm
+runroot rpm -U --nodeps /build/RPMS/noarch/verifyscript-1.0-1.noarch.rpm
touch "${RPMTEST}"/var/checkme
runroot rpm -V --nodeps verifyscript
],
@@ -185,7 +185,7 @@ done
# first instance of a shared file is the one that actually gets created,
# force the order so we know what to expect as these dont depend on each other
-runroot rpm -U --noorder "${TOPDIR}"/RPMS/noarch/conflictone-1.0-1.noarch.rpm "${TOPDIR}"/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm
+runroot rpm -U --noorder /build/RPMS/noarch/conflictone-1.0-1.noarch.rpm /build/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm
runroot rpm -e conflicttwo
runroot rpm -Va --nouser --nogroup
],
--
2.6.6
_______________________________________________
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint
