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

diff --git a/rpmpopt.in b/rpmpopt.in
index 1896c8d..0275605 100644 (file)
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -144,16 +144,16 @@ rpm       alias --httpport        --define '_httpport !#:+'
 rpm    alias --httpproxy       --define '_httpproxy !#:+'
 
 # Minimally preserve commonly used switches from cli split-up
-rpm    exec --addsign          @BINDIR@/rpmsign --addsign
-rpm    exec --delsign          @BINDIR@/rpmsign --delsign
-rpm    exec --resign           @BINDIR@/rpmsign --resign
-rpm    exec --checksig         @BINDIR@/rpmkeys --checksig
-rpm    exec -K                 @BINDIR@/rpmkeys --checksig
-rpm    exec --import           @BINDIR@/rpmkeys --import
-rpm    exec --initdb           @BINDIR@/rpmdb --initdb
-rpm    exec --rebuilddb        @BINDIR@/rpmdb --rebuilddb
-rpm    exec --verifydb         @BINDIR@/rpmdb --verifydb
-rpm    exec --specfile         @BINDIR@/rpmspec -q
+rpm    exec --addsign          rpmsign --addsign
+rpm    exec --delsign          rpmsign --delsign
+rpm    exec --resign           rpmsign --resign
+rpm    exec --checksig         rpmkeys --checksig
+rpm    exec -K                 rpmkeys --checksig
+rpm    exec --import           rpmkeys --import
+rpm    exec --initdb           rpmdb --initdb
+rpm    exec --rebuilddb        rpmdb --rebuilddb
+rpm    exec --verifydb         rpmdb --verifydb
+rpm    exec --specfile         rpmspec -q
 
 #==============================================================================
 rpmbuild alias --ftpport               --define '_httpport !#:+'

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 02a3adc..011f9be 100644 (file)
--- 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 0881e0c..5808596 100644 (file)
--- 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
 ]])