summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.com>2016-08-12 21:47:16 +0200
committerPanu Matilainen <pmatilai@redhat.com>2016-11-02 10:40:43 +0200
commit5a5510848a2ddc28164e9882a42a96a29706e878 (patch)
treea5f9c87dab0853d5ef73d7b99f0eb9d724c30b2a
parent01769c0d88bbb9f2e8d20b2beae5489587496eda (diff)
downloadrpm-5a5510848a2ddc28164e9882a42a96a29706e878.tar.gz
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 <mmarek@suse.com> (backported from commit 3a392532b0074bb7744c4d682f52834e942f50a2)
-rw-r--r--tests/atlocal.in2
-rw-r--r--tests/rpmbuild.at8
-rw-r--r--tests/rpmconfig.at58
-rw-r--r--tests/rpmconfig2.at48
-rw-r--r--tests/rpmconfig3.at40
-rw-r--r--tests/rpmconflict.at20
-rw-r--r--tests/rpmdb.at8
-rw-r--r--tests/rpmdeps.at26
-rw-r--r--tests/rpmi.at40
-rw-r--r--tests/rpmreplace.at78
-rw-r--r--tests/rpmscript.at18
-rw-r--r--tests/rpmverify.at8
12 files changed, 177 insertions, 177 deletions
diff --git a/tests/atlocal.in b/tests/atlocal.in
index c2a07d566..929698725 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 7b582f4f2..8da4d6555 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
@@ -265,7 +265,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 91c03ba57..56437748a 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 04053a1af..e6fa39a3d 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 5a32c0c34..db2e44e17 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 c9329e2b9..f3e9f5a14 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 f1e6c3e9a..3fd2974fc 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 5f08e626b..824688b4a 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 04491c841..5776ad1dc 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],
[],
diff --git a/tests/rpmreplace.at b/tests/rpmreplace.at
index cdc8d03d9..d87c28c93 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 618609908..319828c07 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
],
diff --git a/tests/rpmverify.at b/tests/rpmverify.at
index 39add69e9..d4870d038 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],
@@ -117,7 +117,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
],
@@ -134,7 +134,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
],
@@ -163,7 +163,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
],