RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 16-Feb-2012 20:00:21
Branch: rpm-5_4 Handle: 2012021619002000
Modified files: (Branch: rpm-5_4)
rpm/tests Makefile.am
Log:
- re-enable stubbed-out check-ACID commands.
Summary:
Revision Changes Path
1.95.2.27 +21 -21 rpm/tests/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.95.2.26 -r1.95.2.27 Makefile.am
--- rpm/tests/Makefile.am 15 Feb 2012 21:58:44 -0000 1.95.2.26
+++ rpm/tests/Makefile.am 16 Feb 2012 19:00:20 -0000 1.95.2.27
@@ -401,26 +401,26 @@
check-ACID:
@echo "=== $@ ==="
- -${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 -f $(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 $(rpmdb)/Nvra ] || echo "NACK: Nvra not re-created!"
- rm -f $(rpmdb)/Conflictname
- -${rpm} -q --whatconflicts tyre > /dev/null 2>&1
- [ -f $(rpmdb)/Conflictname ] || echo "NACK: Conflictname not
re-created!"
- rm -f $(rpmdb_Tables)
- -${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_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 $(rpmdb)/Nvra ] || echo "NACK: Nvra not re-created!"
+ @rm -f $(rpmdb)/Conflictname
+ @${rpm} -q --whatconflicts tyre > /dev/null 2>&1
+ @[ -f $(rpmdb)/Conflictname ] || echo "NACK: Conflictname not
re-created!"
+ @rm -f $(rpmdb_Tables)
+ @${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
check-install:
@echo "=== $@ ==="
@@ -845,7 +845,7 @@
@-${rpm} -e probes devtool-sanity
@-${rpm} -U --justdb --nodeps tmp/manifest
@-${rpm} -V probes devtool-sanity > /dev/null
-# @-${rpm} -Va > /dev/null
+ @-${rpm} -Va > /dev/null
#XXX @-${rpm} -Vp tmp/manifest
@-${rpm} -e --noscripts --notriggers --allmatches '^triggers-.*'
@-${rpm} -e car engine wheel door tyre window glass
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
