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: 29-Sep-2010 17:08:51
Branch: HEAD Handle: 2010092915085100
Modified files:
rpm/tests Makefile.am
rpm/tests/ref DB_CONFIG
Log:
- tests: sync with rpm-5_3.
Summary:
Revision Changes Path
1.83 +10 -17 rpm/tests/Makefile.am
1.3 +3 -0 rpm/tests/ref/DB_CONFIG
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.82 -r1.83 Makefile.am
--- rpm/tests/Makefile.am 27 Sep 2010 21:52:08 -0000 1.82
+++ rpm/tests/Makefile.am 29 Sep 2010 15:08:51 -0000 1.83
@@ -139,7 +139,7 @@
sqlite3 = @__SQLITE3@
tar = @__TAR@
-#tdsa_SOURCES = tdsa.c
+#tdsa_SOURCES = tdsa.c
#tdsa_LDADD = $(RPMIO_LDADD)
tecdsa_SOURCES = tecdsa.c
@@ -286,12 +286,6 @@
@-${rpm} -E '%{python:print "--> python: Snake Eggs!",}'
@-${rpm} -E '%{ficl:.( --> ficl: Das OpenBoot!)}'
-# use a GNU make "define" command, that looks like a harmless dummy rule
-# to BSD make, to hide parts of the Makefile from GNU make.
-define IGNORED_BY_GNU_MAKE:
-.if 0
-endef
-
%.spec: $(wildcard %-*.src.rpm)
@${rpm2cpio} $(wildcard $*-*.src.rpm) | ${cpio} -i --quiet $@
@@ -306,7 +300,7 @@
(cd $@ && ${rpm} -q --specfile $...@.spec && ${rpm} -q --specsrpm
$...@.spec && ${rpm} -q --specfile --specedit $...@.spec && ${rpm} -bb --nodeps
$...@.spec || :) > /dev/null
define IGNORED_BY_GNU_MAKE:
-.endif
+.endif
# neither .endif nor endef can be followed by a colon; each creates
# warnings or errors in one or other version of make. we need some
@@ -428,7 +422,7 @@
CM14_uri = $(CM_mirror)/14/oficial/i586/media/main/release/
CM14_manifest = $(testdir)/ref/cm14-bash.i586.manifest
CM15_uri = $(CM_mirror)/15/oficial/i586/media/main/release/
-CM15_manifest = $(testdir)/ref/cm15-minimal.manifest
+#CM15_manifest = $(testdir)/ref/cm15-minimal.manifest
# CAOS -- cAos
CAOS_mirror = http://mirror.caoslinux.org
CAOS2_uri = $(CAOS_mirror)/cAos-2/core/i386/
@@ -511,6 +505,7 @@
# VINE -- Vine Linux
VINE_mirror = http://ring.u-toyama.ac.jp/pub/linux/Vine
VINE51_uri = $(VINE_mirror)/Vine-5.1/i386/Vine/RPMS/
+VINE51_manifest = $(testdir)/ref/vine51-everything.manifest
# YDL -- Yellow Dog Linug (ppc)
YDL_mirror = http://ydl.oregonstate.edu/releases
YDL61_uri = $(YDL_mirror)/yellowdog-6.1/os/YellowDog/
@@ -574,6 +569,7 @@
then ${find} $< -name '*.rpm' | sort -u > $@; \
fi
+# -D '_dbi_tags
Packages:Name:Nvra:Providename:Dirnames:Basenames:Filepaths'
.PRECIOUS: %/solve
%/solve: %/todo
@rm -f $...@d}/import
@@ -583,11 +579,11 @@
@echo "`${now}` <== $...@d}: Created." | tee -a $...@d}/import
@echo "`${now}` ==> $...@d}: Importing ..." | tee -a $...@d}/import
@-${rpm} -i -D '_dbpath $...@d}/solve' --justdb --stats \
- --replacepkgs --replacefiles --oldpackage \
- --noaid --ignoresize --nodeps --noorder \
- --noscripts --notriggers --noparentdirs --nolinktos --nosignature \
+ -D '__dbi_txn create nofsync lock log mpool txn auto_commit thread
thread_count=64' \
+ --noaid --ignoresize --nodeps --noorder --nosignature \
$< \
2>&1 | tee -a $...@d}/import
+ ls -al $...@d}/solve
@echo "`${now}` <== $...@d}: Imported." | tee -a $...@d}/import
Install-%: %/solve
@@ -597,7 +593,7 @@
@${sudo} rm -rf $(<D)/ROOT
@mkdir -p $(<D)/ROOT/var/lib/rpm/log $(<D)/ROOT/var/lib/rpm/tmp
@${cp} $(testdir)/ref/DB_CONFIG $(<D)/ROOT/var/lib/rpm
- @-${sudo} ${rpm} -Uvh --nofdigests \
+ @-${sudo} ${rpm} -Uvh --nofdigests --stats \
-r $(testdir)/$(<D)/ROOT \
-D '_dbpath /var/lib/rpm' \
-D '_solve_A $(<D)/solve' \
@@ -663,10 +659,7 @@
check-query:
@echo "=== $@ ==="
- @${rpm} -qW . > /dev/null 2>&1
-#XXX -${rpm} -Uvv --justdb */*.rpm > /dev/null 2>&1
-#XXX -${rpm} -Uvh --justdb --nodeps */*.rpm > /dev/null 2>&1
-#XXX -${rpm} -i --justdb --nodeps */*.rpm > /dev/null 2>&1
+#XXX @${rpm} -qW . > /dev/null 2>&1
@${rpm} -qa > /dev/null
@${rpm} -qa 'arch=noarch' > /dev/null
@${rpm} -qa 'arch=!noarch' > /dev/null
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/DB_CONFIG
============================================================================
$ cvs diff -u -r1.2 -r1.3 DB_CONFIG
--- rpm/tests/ref/DB_CONFIG 27 Sep 2010 21:55:52 -0000 1.2
+++ rpm/tests/ref/DB_CONFIG 29 Sep 2010 15:08:51 -0000 1.3
@@ -32,6 +32,8 @@
#set_flags DB_AUTO_COMMIT on
#set_flags DB_CDB_ALLDB on
+# XXX http://forums.oracle.com/forums/thread.jspa?messageID=3421463
+# XXX http://www.openldap.org/lists/openldap-devel/200701/msg00018.html
#set_flags DB_DIRECT_DB on
#set_flags DB_DSYNC_DB on
#set_flags DB_MULTIVERSION on
@@ -102,6 +104,7 @@
#set_mp_pagesize u
#set_mp_max_write i i
set_mp_mmapsize 268435456
+#set_mp_mmapsize 536870912
# ================ Replication
#rep_set_clockskew u u
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
