diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2010-11-15 10:21:23 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2010-11-15 10:23:27 +0200 |
commit | 90440e20365d95d98f630d0c1015f5426d4a71cd (patch) | |
tree | aa1ebd150fd30f5fd72d0c74b5b8f7356db36d71 /tests | |
parent | 638fb7ba841441fd6624426997d4a644185f183d (diff) | |
download | rpm-90440e20365d95d98f630d0c1015f5426d4a71cd.tar.gz rpm-90440e20365d95d98f630d0c1015f5426d4a71cd.tar.bz2 rpm-90440e20365d95d98f630d0c1015f5426d4a71cd.zip |
Remove absolute paths from our popt exec aliases now that we can
- poptExecPath() pointing to meaningful place allows removal of these.
- Make test-suite rely on the --initdb exec alias so we catch out
if anything here breaks
Diffstat (limited to 'tests')
-rw-r--r-- | tests/atlocal.in | 3 | ||||
-rw-r--r-- | tests/local.at | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/atlocal.in b/tests/atlocal.in index 02a3adcae..011f9beb1 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -7,7 +7,8 @@ RPMTEST="${abs_builddir}/testing" RPMDATA="${abs_srcdir}/data/" RPM_CONFIGDIR="${RPMTEST}/@RPMCONFIGDIR@" -export RPM_CONFIGDIR +RPM_POPTEXEC_PATH="${RPMTEST}/@usrbindir@" +export RPM_CONFIGDIR RPM_POPTEXEC_PATH # Popt looks into $HOME HOME="${RPMTEST}" diff --git a/tests/local.at b/tests/local.at index 0881e0cde..5808596e4 100644 --- a/tests/local.at +++ b/tests/local.at @@ -1,7 +1,7 @@ AT_TESTED([rpm rpmbuild rpmquery]) m4_define([RPMDB_INIT],[[ -run rpmdb \ +run rpm \ --root="${abs_builddir}"/testing \ --initdb ]]) |