folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust autotests for rpmi etc removal

This commit is contained in:
Panu Matilainen 2008-06-25 09:53:21 +03:00
parent 997f5a24c5
commit c26161d0ab
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Makefile.am
View File

@ -89,25 +89,25 @@ rpmpopt.in: $(top_srcdir)/rpmpopt.in Makefile
CLEANFILES += rpmpopt.in CLEANFILES += rpmpopt.in
# Hack: Abusing testing$(rpmlibexecdir)/rpmb as stamp file # Hack: Abusing testing$(bindir)/rpmbuild as stamp file
testing$(rpmlibexecdir)/rpmb: ../rpmb testing$(bindir)/rpmbuild: ../rpmbuild
rm -rf testing rm -rf testing
(cd ${top_builddir} && \ (cd ${top_builddir} && \
$(MAKE) DESTDIR=`pwd`/${subdir}/testing install) $(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 $(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} && \ (cd ${top_builddir} && \
./config.status --file=${subdir}/testing$(rpmconfigdir)/macros:${subdir}/macros.in) ./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} && \ (cd ${top_builddir} && \
./config.status --file=${subdir}/testing$(rpmconfigdir)/rpmpopt-@VERSION@:${subdir}/rpmpopt.in) ./config.status --file=${subdir}/testing$(rpmconfigdir)/rpmpopt-@VERSION@:${subdir}/rpmpopt.in)
check_DATA = atconfig atlocal $(TESTSUITE) check_DATA = atconfig atlocal $(TESTSUITE)
check_DATA += testing$(rpmlibexecdir)/rpmb check_DATA += testing$(bindir)/rpmbuild
check_DATA += testing$(rpmconfigdir)/rpmrc check_DATA += testing$(rpmconfigdir)/rpmrc
check_DATA += testing$(rpmconfigdir)/macros check_DATA += testing$(rpmconfigdir)/macros
check_DATA += testing$(rpmconfigdir)/rpmpopt-@VERSION@ check_DATA += testing$(rpmconfigdir)/rpmpopt-@VERSION@

12
tests/rpmgeneral.at
View File

@ -33,16 +33,16 @@ AT_CLEANUP
# ------------------------------ # ------------------------------
AT_SETUP([rpmquery --version]) AT_SETUP([rpm --version])
AT_CHECK([rpmquery --version],[0], AT_CHECK([rpm --version],[0],
[RPM version AT_PACKAGE_VERSION [RPM version AT_PACKAGE_VERSION
]) ])
AT_CLEANUP AT_CLEANUP
# ------------------------------ # ------------------------------
AT_SETUP([rpmi --version]) AT_SETUP([rpm --version])
AT_CHECK([rpmi --version],[0], AT_CHECK([rpm --version],[0],
[RPM version AT_PACKAGE_VERSION [RPM version AT_PACKAGE_VERSION
]) ])
AT_CLEANUP AT_CLEANUP
@ -58,8 +58,8 @@ AT_CLEANUP
# ------------------------------ # ------------------------------
# Check rpm --querytags # Check rpm --querytags
# * Some versions of rpm append extraneous whitespaces # * Some versions of rpm append extraneous whitespaces
AT_SETUP([rpmquery --querytags]) AT_SETUP([rpm --querytags])
AT_CHECK([rpmquery --querytags],[0], AT_CHECK([rpm --querytags],[0],
[ARCH [ARCH
ARCHIVESIZE ARCHIVESIZE
BASENAMES BASENAMES

14
tests/rpmi.at
View File

@ -1,4 +1,4 @@
# rpmi.at: test rpmi # rpmi.at: test rpm install
# #
# Copyright (C) 2007 Ralf Corsépius <corsepiu@fedoraproject.org> # 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 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
# ------------------------------ # ------------------------------
# Check if rpmi -U *.src.rpm works # Check if rpm -U *.src.rpm works
AT_SETUP([rpmi -U *.src.rpm]) AT_SETUP([rpm -U *.src.rpm])
AT_CHECK([ AT_CHECK([
TOPDIR="${abs_builddir}"/testing/build TOPDIR="${abs_builddir}"/testing/build
rm -rf ${TOPDIR} rm -rf ${TOPDIR}
AS_MKDIR_P([${TOPDIR}]) AS_MKDIR_P([${TOPDIR}])
rpmi \ rpm \
--rcfile="${RPMRC}" \ --rcfile="${RPMRC}" \
--define "_topdir ${TOPDIR}" \ --define "_topdir ${TOPDIR}" \
-U "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm -U "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm
@ -36,15 +36,15 @@ rpmi \
AT_CLEANUP AT_CLEANUP
# ------------------------------ # ------------------------------
# Check if rpmi -i *.src.rpm works # Check if rpm -i *.src.rpm works
AT_SETUP([rpmi -i *.src.rpm]) AT_SETUP([rpm -i *.src.rpm])
AT_CHECK([ AT_CHECK([
TOPDIR="${abs_builddir}"/testing/build TOPDIR="${abs_builddir}"/testing/build
rm -rf ${TOPDIR} rm -rf ${TOPDIR}
AS_MKDIR_P([${TOPDIR}]) AS_MKDIR_P([${TOPDIR}])
rpmi \ rpm \
--rcfile="${RPMRC}" \ --rcfile="${RPMRC}" \
--define "_topdir ${TOPDIR}" \ --define "_topdir ${TOPDIR}" \
-i "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm -i "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm