From f439f4fc8a217a4088fc1249f1948de875426da3 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 4 Apr 2011 12:03:38 +0300 Subject: [PATCH] Run dependency tests entirely in fakechroot - All the packages here have no files making them "easy" to build inside the chroot --- tests/rpmdeps.at | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/rpmdeps.at b/tests/rpmdeps.at index c550151..af73f99 100644 --- a/tests/rpmdeps.at +++ b/tests/rpmdeps.at @@ -11,10 +11,10 @@ RPMDB_CLEAR RPMDB_INIT rm -rf "${TOPDIR}" -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg one" \ --define "reqs deptest-two" \ - ${RPMDATA}/SPECS/deptest.spec + /data/SPECS/deptest.spec runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm ], @@ -34,15 +34,15 @@ RPMDB_CLEAR RPMDB_INIT rm -rf "${TOPDIR}" -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg one" \ --define "reqs deptest-two" \ - ${RPMDATA}/SPECS/deptest.spec + /data/SPECS/deptest.spec -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg two" \ --define "reqs deptest-one" \ - ${RPMDATA}/SPECS/deptest.spec + /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 ], @@ -60,15 +60,15 @@ RPMDB_CLEAR RPMDB_INIT rm -rf "${TOPDIR}" -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg one" \ --define "reqs deptest-two >= 2.0" \ - ${RPMDATA}/SPECS/deptest.spec + /data/SPECS/deptest.spec -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg two" \ --define "provs deptest-foo = 1.0" \ - ${RPMDATA}/SPECS/deptest.spec + /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 ], @@ -88,15 +88,15 @@ RPMDB_CLEAR RPMDB_INIT rm -rf "${TOPDIR}" -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg one" \ --define "reqs deptest-foo >= 2.0" \ - ${RPMDATA}/SPECS/deptest.spec + /data/SPECS/deptest.spec -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg two" \ --define "provs deptest-foo = 2.0" \ - ${RPMDATA}/SPECS/deptest.spec + /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 ], @@ -114,14 +114,14 @@ RPMDB_CLEAR RPMDB_INIT rm -rf "${TOPDIR}" -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg one" \ --define "cfls deptest-two < 2.0" \ - ${RPMDATA}/SPECS/deptest.spec + /data/SPECS/deptest.spec -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg two" \ - ${RPMDATA}/SPECS/deptest.spec + /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 ], @@ -141,14 +141,14 @@ RPMDB_CLEAR RPMDB_INIT rm -rf "${TOPDIR}" -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg one" \ --define "cfls deptest-two < 2.0" \ - ${RPMDATA}/SPECS/deptest.spec + /data/SPECS/deptest.spec -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg two" \ - ${RPMDATA}/SPECS/deptest.spec + /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 @@ -168,15 +168,15 @@ RPMDB_CLEAR RPMDB_INIT rm -rf "${TOPDIR}" -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg one" \ --define "reqs deptest-foo >= 2.0" \ - ${RPMDATA}/SPECS/deptest.spec + /data/SPECS/deptest.spec -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg two" \ --define "provs deptest-foo = 2.0" \ - ${RPMDATA}/SPECS/deptest.spec + /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 -e deptest-two -- 2.7.4