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: 09-Oct-2010 04:23:05
Branch: HEAD Handle: 2010100902223427
Modified files:
rpm CHANGES configure.ac
rpm/macros macros.in
rpm/tests Makefile.am
Log:
- tests: resurrect the "check-ACID" target using external db51_utils.
Summary:
Revision Changes Path
1.3462 +1 -0 rpm/CHANGES
2.458 +10 -0 rpm/configure.ac
1.33 +12 -1 rpm/macros/macros.in
1.87 +11 -11 rpm/tests/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3461 -r1.3462 CHANGES
--- rpm/CHANGES 9 Oct 2010 01:37:06 -0000 1.3461
+++ rpm/CHANGES 9 Oct 2010 02:22:34 -0000 1.3462
@@ -1,4 +1,5 @@
5.3.4 -> 5.4a1:
+ - jbj: tests: resurrect the "check-ACID" target using external
db51_utils.
- jbj: db: build against external db-5.1.19 using --with-db/--with-dbsql.
- jbj: rpmlio: disable for now, needs --with-db=internal.
- jbj: db_tool: disable for now, needs --with-db=internal.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.457 -r2.458 configure.ac
--- rpm/configure.ac 9 Oct 2010 01:37:07 -0000 2.457
+++ rpm/configure.ac 9 Oct 2010 02:22:36 -0000 2.458
@@ -466,6 +466,16 @@
AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH)
AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH)
+AC_PATH_PROG(__DB_ARCHIVE, db51_archive, %{_bindir}/db51_archive, $MYPATH)
+AC_PATH_PROG(__DB_CHECKPOINT, db51_checkpoint, %{_bindir}/db51_checkpoint,
$MYPATH)
+AC_PATH_PROG(__DB_DUMP, db51_dump, %{_bindir}/db51_dump, $MYPATH)
+AC_PATH_PROG(__DB_LOAD, db51_load, %{_bindir}/db51_load, $MYPATH)
+AC_PATH_PROG(__DB_LOG_VERIFY, db51_log_verify, %{_bindir}/db51_log_verify,
$MYPATH)
+AC_PATH_PROG(__DB_PRINTLOG, db51_printlog, %{_bindir}/db51_printlog, $MYPATH)
+AC_PATH_PROG(__DB_RECOVER, db51_recover, %{_bindir}/db51_recover, $MYPATH)
+AC_PATH_PROG(__DB_STAT, db51_stat, %{_bindir}/db51_stat, $MYPATH)
+AC_PATH_PROG(__DB_UPGRADE, db51_upgrade, %{_bindir}/db51_upgrade, $MYPATH)
+AC_PATH_PROG(__DB_VERIFY, db51_verify, %{_bindir}/db51_verify, $MYPATH)
AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
============================================================================
$ cvs diff -u -r1.32 -r1.33 macros.in
--- rpm/macros/macros.in 7 Oct 2010 17:00:56 -0000 1.32
+++ rpm/macros/macros.in 9 Oct 2010 02:22:58 -0000 1.33
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.32 2010/10/07 17:00:56 jbj Exp $
+# $Id: macros.in,v 1.33 2010/10/09 02:22:58 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -46,6 +46,7 @@
%_usrlibrpmbin %{_usrlibrpm}/bin
%__chroot %{_usrlibrpmbin}/chroot
%__cp %{_usrlibrpmbin}/cp
+%__dbsql %{_usrlibrpmbin}/dbsql
%__find %{_usrlibrpmbin}/find
%__grep %{_usrlibrpmbin}/grep
%__lua %{_usrlibrpmbin}/lua
@@ -67,6 +68,16 @@
%__cpio @__CPIO@
%__curl @__CURL@
%__cvs @__CVS@
+%__db_archive @__DB_ARCHIVE@
+%__db_checkpoint @__DB_CHECKPOINT@
+%__db_dump @__DB_DUMP@
+%__db_load @__DB_LOAD@
+%__db_log_verify @__DB_LOG_VERIFY@
+%__db_printlog @__DB_PRINTLOG@
+%__db_recover @__DB_RECOVER@
+%__db_stat @__DB_STAT@
+%__db_upgrade @__DB_UPGRADE@
+%__db_verify @__DB_VERIFY@
%__diff @__DIFF@
%__ditto @__DITTO@
%__file @__FILE@
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.86 -r1.87 Makefile.am
--- rpm/tests/Makefile.am 30 Sep 2010 19:14:31 -0000 1.86
+++ rpm/tests/Makefile.am 9 Oct 2010 02:23:01 -0000 1.87
@@ -113,17 +113,17 @@
$(rpmdb)/Triggername \
$(rpmdb)/Version
-db_tool = $(abs_top_builddir)/tools/db_tool
-db_archive = ${db_tool} db_archive -h $(rpmdb) -v
-db_checkpoint = ${db_tool} db_checkpoint -h $(rpmdb) -v
-db_dump = ${db_tool} db_dump -h $(rpmdb)
-db_load = ${db_tool} db_load -h $(rpmdb)
-db_log_verify = ${db_tool} db_log_verify -h $(rpmdb)
-db_printlog = ${db_tool} db_printlog -h $(rpmdb)
-db_recover = ${db_tool} db_recover -h $(rpmdb) -v
-db_stat = ${db_tool} db_stat -h $(rpmdb)
-db_upgrade = ${db_tool} db_upgrade -h $(rpmdb) -v
-db_verify = ${db_tool} db_verify -h $(rpmdb)
+db_archive = @__DB_ARCHIVE@ -h $(rpmdb) -v
+db_checkpoint = @__DB_CHECKPOINT@ -h $(rpmdb) -v
+db_dump = @__DB_DUMP@ -h $(rpmdb)
+db_load = @__DB_LOAD@ -h $(rpmdb)
+db_log_verify = @__DB_LOG_VERIFY@ -h $(rpmdb)
+db_printlog = @__DB_PRINTLOG@ -h $(rpmdb)
+db_recover = @__DB_RECOVER@ -h $(rpmdb) -v
+db_stat = @__DB_STAT@ -h $(rpmdb)
+db_upgrade = @__DB_UPGRADE@ -h $(rpmdb) -v
+db_verify = @__DB_VERIFY@ -h $(rpmdb)
+
dbsql = $(abs_top_builddir)/tools/dbsql
cpio = @__CPIO@
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
