diff options
| -rw-r--r-- | tests/Makefile.am | 12 | ||||
| -rw-r--r-- | tests/rpmgeneral.at | 12 | ||||
| -rw-r--r-- | tests/rpmi.at | 14 |
3 files changed, 19 insertions, 19 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c6b5d2488..680ce29c6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -89,25 +89,25 @@ rpmpopt.in: $(top_srcdir)/rpmpopt.in Makefile CLEANFILES += rpmpopt.in -# Hack: Abusing testing$(rpmlibexecdir)/rpmb as stamp file -testing$(rpmlibexecdir)/rpmb: ../rpmb +# Hack: Abusing testing$(bindir)/rpmbuild as stamp file +testing$(bindir)/rpmbuild: ../rpmbuild rm -rf testing (cd ${top_builddir} && \ $(MAKE) DESTDIR=`pwd`/${subdir}/testing install) -testing$(rpmconfigdir)/rpmrc: rpmrc testing$(rpmlibexecdir)/rpmb +testing$(rpmconfigdir)/rpmrc: rpmrc testing$(bindir)/rpmbuild $(INSTALL_DATA) rpmrc testing$(rpmconfigdir)/rpmrc -testing$(rpmconfigdir)/macros: macros.in testing$(rpmlibexecdir)/rpmb +testing$(rpmconfigdir)/macros: macros.in testing$(bindir)/rpmbuild (cd ${top_builddir} && \ ./config.status --file=${subdir}/testing$(rpmconfigdir)/macros:${subdir}/macros.in) -testing$(rpmconfigdir)/rpmpopt-@VERSION@: rpmpopt.in testing$(rpmlibexecdir)/rpmb +testing$(rpmconfigdir)/rpmpopt-@VERSION@: rpmpopt.in testing$(bindir)/rpmbuild (cd ${top_builddir} && \ ./config.status --file=${subdir}/testing$(rpmconfigdir)/rpmpopt-@VERSION@:${subdir}/rpmpopt.in) check_DATA = atconfig atlocal $(TESTSUITE) -check_DATA += testing$(rpmlibexecdir)/rpmb +check_DATA += testing$(bindir)/rpmbuild check_DATA += testing$(rpmconfigdir)/rpmrc check_DATA += testing$(rpmconfigdir)/macros check_DATA += testing$(rpmconfigdir)/rpmpopt-@VERSION@ diff --git a/tests/rpmgeneral.at b/tests/rpmgeneral.at index 1452b9750..32b8e67ca 100644 --- a/tests/rpmgeneral.at +++ b/tests/rpmgeneral.at @@ -33,16 +33,16 @@ AT_CLEANUP # ------------------------------ -AT_SETUP([rpmquery --version]) -AT_CHECK([rpmquery --version],[0], +AT_SETUP([rpm --version]) +AT_CHECK([rpm --version],[0], [RPM version AT_PACKAGE_VERSION ]) AT_CLEANUP # ------------------------------ -AT_SETUP([rpmi --version]) -AT_CHECK([rpmi --version],[0], +AT_SETUP([rpm --version]) +AT_CHECK([rpm --version],[0], [RPM version AT_PACKAGE_VERSION ]) AT_CLEANUP @@ -58,8 +58,8 @@ AT_CLEANUP # ------------------------------ # Check rpm --querytags # * Some versions of rpm append extraneous whitespaces -AT_SETUP([rpmquery --querytags]) -AT_CHECK([rpmquery --querytags],[0], +AT_SETUP([rpm --querytags]) +AT_CHECK([rpm --querytags],[0], [ARCH ARCHIVESIZE BASENAMES diff --git a/tests/rpmi.at b/tests/rpmi.at index 94a1a5a1f..c968a32c5 100644 --- a/tests/rpmi.at +++ b/tests/rpmi.at @@ -1,4 +1,4 @@ -# rpmi.at: test rpmi +# rpmi.at: test rpm install # # Copyright (C) 2007 Ralf Corsépius <corsepiu@fedoraproject.org> # @@ -17,15 +17,15 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ------------------------------ -# Check if rpmi -U *.src.rpm works -AT_SETUP([rpmi -U *.src.rpm]) +# Check if rpm -U *.src.rpm works +AT_SETUP([rpm -U *.src.rpm]) AT_CHECK([ TOPDIR="${abs_builddir}"/testing/build rm -rf ${TOPDIR} AS_MKDIR_P([${TOPDIR}]) -rpmi \ +rpm \ --rcfile="${RPMRC}" \ --define "_topdir ${TOPDIR}" \ -U "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm @@ -36,15 +36,15 @@ rpmi \ AT_CLEANUP # ------------------------------ -# Check if rpmi -i *.src.rpm works -AT_SETUP([rpmi -i *.src.rpm]) +# Check if rpm -i *.src.rpm works +AT_SETUP([rpm -i *.src.rpm]) AT_CHECK([ TOPDIR="${abs_builddir}"/testing/build rm -rf ${TOPDIR} AS_MKDIR_P([${TOPDIR}]) -rpmi \ +rpm \ --rcfile="${RPMRC}" \ --define "_topdir ${TOPDIR}" \ -i "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm |