RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   22-Sep-2010 20:27:15
  Branch: rpm-5_3                          Handle: 2010092218271500

  Modified files:           (Branch: rpm-5_3)
    rpm/tests               Makefile.am

  Log:
    - tests: zero tolerance for check-ACID failures using db_tool et al.

  Summary:
    Revision    Changes     Path
    1.63.2.13   +16 -14     rpm/tests/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.63.2.12 -r1.63.2.13 Makefile.am
  --- rpm/tests/Makefile.am	21 Sep 2010 16:19:01 -0000	1.63.2.12
  +++ rpm/tests/Makefile.am	22 Sep 2010 18:27:15 -0000	1.63.2.13
  @@ -331,24 +331,26 @@
   
   check-ACID:
   	@echo "=== $@ ==="
  -	@-${db_upgrade} Packages
  -	@-${db_checkpoint} -1	> /dev/null 2>&1
  -	@${rpm} -Uvh --stats ref/edos.manifest
  -	@-${db_dump} Packages | ${db_load} Packages
  -	@-${db_verify} Packages
  -	@-${db_stat} -CA	> /dev/null 2>&1
  -	@rm -f tmp/rpmdb/Nvra
  +	@${db_upgrade} Packages > /dev/null 2>&1
  +	@${db_checkpoint} -1	> /dev/null 2>&1
  +	@${rpm} -U ref/edos.manifest
  +	@${db_dump} Packages | ${db_load} Packages-NEW
  +	@${db_verify} Packages-NEW > /dev/null 2>&1
  +	@rm $(rpmdb)/Packages-NEW
  +	@${db_verify} Packages > /dev/null 2>&1
  +	@${db_stat} -CA	> /dev/null 2>&1
  +	@rm -f $(rpmdb)/Nvra
   	@${rpm} -q tyre > /dev/null 2>&1
  -	@[ -f tmp/rpmdb/Nvra ] || echo "NACK: Nvra not re-created!"
  -	@rm -f tmp/rpmdb/Conflictname
  +	@[ -f $(rpmdb)/Nvra ] || echo "NACK: Nvra not re-created!"
  +	@rm -f $(rpmdb)/Conflictname
   	@${rpm} -q --whatconflicts tyre > /dev/null 2>&1
  -	@[ -f tmp/rpmdb/Conflictname ] || echo "NACK: Conflictname not re-created!"
  +	@[ -f $(rpmdb)/Conflictname ] || echo "NACK: Conflictname not re-created!"
   	@rm -f $(rpmdb_Tables)
  -	@-${db_recover} -e
  +	@${db_recover} -e
   	@${rpm} -e car engine wheel door tyre window glass
  -	@-${db_printlog} -r	> /dev/null 2>&1
  -	@-${db_checkpoint} -1	> /dev/null 2>&1
  -	@-${db_archive} -d
  +	@${db_printlog} -r	> /dev/null 2>&1
  +	@${db_checkpoint} -1	> /dev/null 2>&1
  +	@${db_archive} -d
   
   check-install:
   	@echo "=== $@ ==="
  @@ .