diff options
Diffstat (limited to 'tests/atlocal.in')
| -rw-r--r-- | tests/atlocal.in | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/tests/atlocal.in b/tests/atlocal.in index 5ce6f4f93..d7d837f45 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -3,7 +3,7 @@ export LD_LIBRARY_PATH PATH="${abs_builddir}/testing@rpmbindir@:${abs_builddir}/testing@usrbindir@:$PATH" export PATH -PYLIBDIR=`python -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))"` +PYLIBDIR=`python -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1,0,'@execprefix@'))"` PYTHONPATH="${abs_builddir}/testing${PYLIBDIR}" export PYTHONPATH @@ -18,18 +18,35 @@ export RPM_CONFIGDIR RPM_POPTEXEC_PATH HOME="${RPMTEST}" export HOME +TZ=UTC +export TZ + TOPDIR="${RPMTEST}/build" RPM_XFAIL=${RPM_XFAIL-1} function run() { - "$@" --define "_topdir ${TOPDIR}" --dbpath="${RPMTEST}/var/lib/rpm/" + "$@" --define "_tmppath ${RPMTEST}/tmp" --define "_topdir ${TOPDIR}" --dbpath="${RPMTEST}/var/lib/rpm/" +} + +function rundebug() +{ + cp ${top_srcdir}/macros.debug ${RPM_CONFIGDIR}/macros.d/ + "$@" --define "_tmppath ${RPMTEST}/tmp" --define "_topdir ${TOPDIR}" --dbpath="${RPMTEST}/var/lib/rpm/" + rm -f ${RPM_CONFIGDIR}/macros.d/macros.debug } function runroot() { - (cd ${RPMTEST} && \ - MAGIC="/magic/magic" FAKECHROOT_BASE="${RPMTEST}" fakechroot "$@" --define "_topdir /build" + (unset RPM_CONFIGDIR RPM_POPTEXEC_PATH; cd ${RPMTEST} && \ + MAGIC="/magic/magic" FAKECHROOT_BASE="${RPMTEST}" fakechroot "$@" --define "_topdir /build" --noplugins + ) +} + +function runroot_other() +{ + (unset RPM_CONFIGDIR RPM_POPTEXEC_PATH; cd ${RPMTEST} && \ + FAKECHROOT_BASE="${RPMTEST}" fakechroot "$@" ) } |