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:08:50
  Branch: HEAD                             Handle: 2010081901084802

  Modified files:
    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.3418      +1  -0      rpm/CHANGES
    1.78        +52 -3      rpm/tests/Makefile.am
    1.27        +8  -3      rpm/tests/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3417 -r1.3418 CHANGES
  --- rpm/CHANGES	19 Aug 2010 01:04:55 -0000	1.3417
  +++ rpm/CHANGES	19 Aug 2010 01:08:48 -0000	1.3418
  @@ -1,4 +1,5 @@
   5.3.2 -> 5.4a1:
  +    - jbj: solve: commit to a test framework based on EDOS and Poky.
       - jbj: solve: use RPMTAG_PACKAGEORIGIN paths when available.
       - jbj: neon: fix: permit building w neon-0.25.x.
       - jbj: ssl: fix: permit building w/o ECDSA.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.77 -r1.78 Makefile.am
  --- rpm/tests/Makefile.am	21 Jun 2010 01:31:36 -0000	1.77
  +++ rpm/tests/Makefile.am	19 Aug 2010 01:08:50 -0000	1.78
  @@ -47,6 +47,8 @@
   rpmdigest =	$(abs_top_builddir)/tools/rpmdigest
   rpmrepo =	$(abs_top_builddir)/tools/rpmrepo
   rpmsql =	$(abs_top_builddir)/tools/sqlite3
  +rpmsolverA =	${rpm} -i -D '_dbpath %{_solve_A}' --justdb --nodeps
  +rpmsolverB =	${rpm} -i -D '_dbpath %{_solve_B}' --justdb --nodeps
   
   tdsa =		./tdsa
   tecdsa =	./tecdsa
  @@ -67,14 +69,25 @@
   wget =		/usr/bin/wget
   
   sudo =		sudo
  +caixaroot =	$(abs_top_builddir)/tests/tmp/CAIXA
   caosroot =	$(abs_top_builddir)/tests/tmp/CAOS
   centosroot =	$(abs_top_builddir)/tests/tmp/CENTOS
  -suseroot =	$(abs_top_builddir)/tests/tmp/SUSE
  -mandrivaroot =	$(abs_top_builddir)/tests/tmp/MANDRIVA
  -caixaroot =	$(abs_top_builddir)/tests/tmp/CAIXA
   idmsroot =	$(abs_top_builddir)/tests/tmp/IDMS
  +mandrivaroot =	$(abs_top_builddir)/tests/tmp/MANDRIVA
  +suseroot =	$(abs_top_builddir)/tests/tmp/SUSE
   unityroot =	$(abs_top_builddir)/tests/tmp/UNITY
   
  +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)
  +
   rpmdb =		$(abs_top_builddir)/tests/tmp/rpmdb
   rpmdb_Tables = \
   	$(rpmdb)/Arch	\
  @@ -286,6 +299,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
  +
   check-ACID:
   	@echo "=== $@ ==="
   	@-${db_upgrade} Packages
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/macros.in
  ============================================================================
  $ cvs diff -u -r1.26 -r1.27 macros.in
  --- rpm/tests/macros.in	25 Apr 2010 12:26:25 -0000	1.26
  +++ rpm/tests/macros.in	19 Aug 2010 01:08:49 -0000	1.27
  @@ -35,10 +35,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}
  @@ .