From: Panu Matilainen Date: Mon, 4 Apr 2011 11:05:17 +0000 (+0300) Subject: Execute all non-compilation rpmbuild tests in fakechroot X-Git-Tag: tznext/4.11.0.1.tizen20130304~1218 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aea6f0423fc3cf26a7e244e79b62c3b94c09d0c7;p=tools%2Flibrpm-tizen.git Execute all non-compilation rpmbuild tests in fakechroot - Except for four rpmbuild tests which rely on an actual compiler being available (faking *that* would get entertaining...), the entire test-suite is now executing everything in the fakechroot environment. --- diff --git a/tests/rpmconfig.at b/tests/rpmconfig.at index c8ad81a..e84afb2 100644 --- a/tests/rpmconfig.at +++ b/tests/rpmconfig.at @@ -13,10 +13,10 @@ rm -rf "${TOPDIR}" rm -rf "${RPMTEST}/etc/my.conf" for v in "1.0" "2.0"; do - run rpmbuild --quiet -bb \ + runroot rpmbuild --quiet -bb \ --define "ver $v" \ --define "filedata foo" \ - ${RPMDATA}/SPECS/configtest.spec + /data/SPECS/configtest.spec done runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm @@ -37,10 +37,10 @@ rm -rf "${TOPDIR}" rm -rf "${RPMTEST}/etc/my.conf" for v in "1.0" "2.0"; do - run rpmbuild --quiet -bb \ + runroot rpmbuild --quiet -bb \ --define "ver $v" \ --define "filedata foo" \ - ${RPMDATA}/SPECS/configtest.spec + /data/SPECS/configtest.spec done runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm @@ -62,10 +62,10 @@ rm -rf "${TOPDIR}" rm -rf "${RPMTEST}/etc/my.conf" for v in "1.0" "2.0"; do - run rpmbuild --quiet -bb \ + runroot rpmbuild --quiet -bb \ --define "ver $v" \ --define "filedata foo-$v" \ - ${RPMDATA}/SPECS/configtest.spec + /data/SPECS/configtest.spec done runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm @@ -86,10 +86,10 @@ rm -rf "${TOPDIR}" rm -rf "${RPMTEST}/etc/my.conf" for v in "1.0" "2.0"; do - run rpmbuild --quiet -bb \ + runroot rpmbuild --quiet -bb \ --define "ver $v" \ --define "filedata foo-$v" \ - ${RPMDATA}/SPECS/configtest.spec + /data/SPECS/configtest.spec done runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm diff --git a/tests/rpmconflict.at b/tests/rpmconflict.at index 86e6aa1..89b6857 100644 --- a/tests/rpmconflict.at +++ b/tests/rpmconflict.at @@ -12,10 +12,10 @@ RPMDB_INIT rm -rf "${TOPDIR}" for p in "one" "two"; do - run rpmbuild --quiet -bb \ + runroot rpmbuild --quiet -bb \ --define "pkg $p" \ --define "filedata $p" \ - ${RPMDATA}/SPECS/conflicttest.spec + /data/SPECS/conflicttest.spec done runroot rpm -U "${TOPDIR}"/RPMS/noarch/conflictone-1.0-1.noarch.rpm @@ -53,10 +53,10 @@ RPMDB_INIT rm -rf "${TOPDIR}" for p in "one" "two"; do - run rpmbuild --quiet -bb \ + runroot rpmbuild --quiet -bb \ --define "pkg $p" \ --define "filedata same_stuff" \ - ${RPMDATA}/SPECS/conflicttest.spec + /data/SPECS/conflicttest.spec done runroot rpm -U "${TOPDIR}"/RPMS/noarch/conflictone-1.0-1.noarch.rpm @@ -95,10 +95,10 @@ RPMDB_INIT rm -rf "${TOPDIR}" rm -rf "${RPMTEST}"/usr/{share,lib}/symlinktest* -run rpmbuild --quiet -bb \ - --define "rel 1" --without symlink ${RPMDATA}/SPECS/symlinktest.spec -run rpmbuild --quiet -bb \ - --define "rel 2" --with symlink ${RPMDATA}/SPECS/symlinktest.spec +runroot rpmbuild --quiet -bb \ + --define "rel 1" --without symlink /data/SPECS/symlinktest.spec +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 @@ -123,10 +123,10 @@ RPMDB_INIT rm -rf "${TOPDIR}" rm -rf "${RPMTEST}"/usr/{share,lib}/symlinktest* -run rpmbuild --quiet -bb \ - --define "rel 1" --with symlink ${RPMDATA}/SPECS/symlinktest.spec -run rpmbuild --quiet -bb \ - --define "rel 2" --without symlink ${RPMDATA}/SPECS/symlinktest.spec +runroot rpmbuild --quiet -bb \ + --define "rel 1" --with symlink /data/SPECS/symlinktest.spec +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 diff --git a/tests/rpmdb.at b/tests/rpmdb.at index 8ef3711..d73e4ef 100644 --- a/tests/rpmdb.at +++ b/tests/rpmdb.at @@ -127,10 +127,10 @@ RPMDB_CLEAR RPMDB_INIT rm -rf "${TOPDIR}" -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg status" \ --define "filedata same_stuff" \ - ${RPMDATA}/SPECS/conflicttest.spec + /data/SPECS/conflicttest.spec runroot rpm -U "${TOPDIR}"/RPMS/noarch/conflictstatus-1.0-1.noarch.rpm runroot rpm -qls conflictstatus @@ -150,8 +150,8 @@ RPMDB_CLEAR RPMDB_INIT rm -rf "${TOPDIR}" -run rpmbuild --quiet -bb \ - ${RPMDATA}/SPECS/flangtest.spec +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 -qls flangtest @@ -176,10 +176,10 @@ RPMDB_INIT rm -rf "${TOPDIR}" rm -f "${RPMTEST}"/usr/share/my.version -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg status" \ --define "filedata same_stuff" \ - ${RPMDATA}/SPECS/conflicttest.spec + /data/SPECS/conflicttest.spec runroot rpm -U "${TOPDIR}"/RPMS/noarch/conflictstatus-1.0-1.noarch.rpm test -f "${RPMTEST}"/usr/share/my.version @@ -199,10 +199,10 @@ RPMDB_INIT rm -rf "${TOPDIR}" rm -f "${RPMTEST}"/usr/share/my.version -run rpmbuild --quiet -bb \ +runroot rpmbuild --quiet -bb \ --define "pkg status" \ --define "filedata same_stuff" \ - ${RPMDATA}/SPECS/conflicttest.spec + /data/SPECS/conflicttest.spec runroot rpm -U "${TOPDIR}"/RPMS/noarch/conflictstatus-1.0-1.noarch.rpm runroot rpm -e conflictstatus