RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 19-Aug-2010 03:09:52
Branch: rpm-5_2 Handle: 2010081901095001
Modified files: (Branch: rpm-5_2)
rpm CHANGES
rpm/tests Makefile.am macros.in
Log:
- solve: commit to a test framework based on EDOS and Poky.
Summary:
Revision Changes Path
1.2970.2.64 +1 -0 rpm/CHANGES
1.35.2.4 +49 -0 rpm/tests/Makefile.am
1.23.2.2 +8 -3 rpm/tests/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2970.2.63 -r1.2970.2.64 CHANGES
--- rpm/CHANGES 19 Aug 2010 01:06:18 -0000 1.2970.2.63
+++ rpm/CHANGES 19 Aug 2010 01:09:50 -0000 1.2970.2.64
@@ -1,4 +1,5 @@
5.2.1 -> 5.2.2:
+ - jbj: solve: commit to a test framework based on EDOS and Poky.
- jbj: solve: use RPMTAG_PACKAGEORIGIN paths when available.
- jbj: ruby: fix: retrofit RSTRING_PTR/RSTRING_LEN into ruby-1.8.5.
- jbj: solve: loop over solve db's in a bag.
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.35.2.3 -r1.35.2.4 Makefile.am
--- rpm/tests/Makefile.am 27 Apr 2010 17:25:49 -0000 1.35.2.3
+++ rpm/tests/Makefile.am 19 Aug 2010 01:09:51 -0000 1.35.2.4
@@ -41,6 +41,19 @@
rpmcache = $(abs_top_builddir)/tools/rpmcache --macros $(macros)
rpmdigest = $(abs_top_builddir)/tools/rpmdigest
rpmrepo = $(abs_top_builddir)/tools/rpmrepo
+rpmsolverA = ${rpm} -i -D '_dbpath %{_solve_A}' --justdb --nodeps
+rpmsolverB = ${rpm} -i -D '_dbpath %{_solve_B}' --justdb --nodeps
+
+poky_topdir = /X/src/poky
+poky_deploy = $(poky_topdir)/build/tmp/deploy/rpm
+poky_pkgsdirA = $(poky_deploy)/i586
+poky_pkgsdirB = $(poky_deploy)/all
+poky_pkgsdirC = $(poky_deploy)/qemux86
+poky_options = --noaid --nodeps --noorder --noscripts --notriggers --noparentdirs --nolinktos --stats
+poky_force = --replacepkgs --replacefiles --oldpackage
+poky_solverA = ${rpm} -i $(poky_force) -D '_dbpath %{_solve_A}' --justdb $(poky_options)
+poky_solverB = ${rpm} -i $(poky_force) -D '_dbpath %{_solve_B}' --justdb $(poky_options)
+poky_solverC = ${rpm} -i $(poky_force) -D '_dbpath %{_solve_C}' --justdb $(poky_options)
tpgp = ./tpgp --macros $(macros)
@@ -229,6 +242,42 @@
@diff -u {tmp,ref}/edos.qa.2 || ${cp} {tmp,ref}/edos.qa.2
@${rpm} -e car engine wheel door tyre window glass
+check-depsolver:
+ @echo "=== $@ ==="
+ rm -rf tmp/solveA tmp/solveB tmp/solveC
+ ${rpmsolverA} edos-test/turbo-1* edos-test/wheel-2* edos-test/door-1*
+ ${rpmsolverB} edos-test/engine-2*
+ rm -rf tmp/hrmib tmp/repackage
+ mkdir -p tmp/hrmib/ tmp/repackage/
+ -${rpm} -e --nodeps turbo
+ -${rpm} -e --nodeps car
+ -${rpm} -e --nodeps engine
+ -${rpm} -e --nodeps wheel
+ -${rpm} -e --nodeps door
+ -${rpm} -U edos-test/car-1-*
+ -${rpm} -qa
+ -${rpm} -e --nodeps turbo
+ -${rpm} -e --nodeps car
+ -${rpm} -e --nodeps engine
+ -${rpm} -e --nodeps wheel
+ -${rpm} -e --nodeps door
+
+check-poky:
+ @echo "=== $@ ==="
+ @rm -rf tmp/solveA tmp/solveB tmp/solveC
+ ${poky_solverA} $(poky_pkgsdirA)/*.rpm
+ ${poky_solverB} $(poky_pkgsdirB)/*.rpm
+ ${poky_solverC} $(poky_pkgsdirC)/*.rpm
+ @rm -rf tmp/hrmib tmp/repackage
+ @mkdir -p tmp/hrmib/ tmp/repackage/
+ find $(poky_pkgsdirA) $(poky_pkgsdirB) $(poky_pkgsdirC) -name '*.rpm' | sort -u > poky_manifest
+ -for F in `cat poky_manifest`; do \
+ echo "-----> " $$F; \
+ ${rpm} -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --stats $$F || : ; \
+ ${rpm} -Va --nofiles --noaid --noparentdirs --nolinktos || : ; \
+ ${rpm} -e --justdb --nodeps --noscripts --notriggers `${rpm} -qa | grep -v gpg-pubkey` || : ; \
+ done
+
.PHONY: check-ACID
check-ACID:
@echo "=== $@ ==="
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/macros.in
============================================================================
$ cvs diff -u -r1.23.2.1 -r1.23.2.2 macros.in
--- rpm/tests/macros.in 26 Apr 2010 08:50:06 -0000 1.23.2.1
+++ rpm/tests/macros.in 19 Aug 2010 01:09:51 -0000 1.23.2.2
@@ -31,10 +31,15 @@
%_bhVR %{nil}
%_bhA %{nil}
-%_solve_dbpath %{_tmppath}/cachedb/
-%_solve_pkgsdir %{_topdir}/edos-test/
-%_solve_name_fmt %{?_solve_pkgsdir}%{___NVRA}.rpm
+%_solve_A %{_tmppath}/solveA/
+%_solve_B %{_tmppath}/solveB/
+%_solve_C %{_tmppath}/solveC/
+%_solve_dbpath %{_solve_A}:%{_solve_B}:%{_solve_C}
+# XXX uncomment if solvedb headers don't have RPMTAG_PACKAGEORIGIN
+#%_solve_pkgsdir %{_topdir}/edos-test/
+#%_solve_name_fmt %{?_solve_pkgsdir}%{___NVRA}.rpm
+
%find_lang %{_testdir}/../scripts/find-lang.sh %{buildroot}
%_rpmfc_magic_path %{_testdir}/../file/magic/magic
%__libtool_provides %{nil}
@@ .
Received on Thu Aug 19 03:09:53 2010