RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 30-Jul-2008 14:14:13
Branch: HEAD Handle: 2008073012141101
Modified files:
rpm/tests Makefile.am
rpm/tests/ref .alldigests showrc
Log:
- jbj: plateau w-i-p until <stdint.h> is excised.
Summary:
Revision Changes Path
1.27 +10 -4 rpm/tests/Makefile.am
1.12 +38 -38 rpm/tests/ref/.alldigests
1.6 +47 -0 rpm/tests/ref/showrc
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.26 -r1.27 Makefile.am
--- rpm/tests/Makefile.am 16 Jun 2008 19:58:51 -0000 1.26
+++ rpm/tests/Makefile.am 30 Jul 2008 12:14:11 -0000 1.27
@@ -12,6 +12,7 @@
rpmdigest = $(abs_top_builddir)/tools/rpmdigest
rpmmtree = $(abs_top_builddir)/tools/rpmmtree
rpmrepo = $(abs_top_builddir)/tools/rpmrepo
+rpmwget = wget
cpio = cpio
.PHONY: check-init
@@ -33,7 +34,7 @@
popt-1.14-1.i386.rpm
$(POPTPKGS):
- -wget $(POPTURI)$@
+ -${rpmwget} $(POPTURI)$@
.PHONY: check-pubkeys
check-pubkeys: $(POPTPKGS)
@@ -98,7 +99,7 @@
${rpm} -U --relocate /tmp/=$(testdir)/tmp/root/ --nodeps
devtool-sanity/*.rpm
${rpm} -U probes-test/probes-2*.rpm
-check-local: check-init check-pubkeys check-markup check-build check-install
+check-query:
@${rpm} -qW . > /dev/null 2>&1
[EMAIL PROTECTED] -U --justdb */*.rpm > /dev/null 2>&1
[EMAIL PROTECTED] -Uvh --justdb --nodeps */*.rpm > /dev/null 2>&1
@@ -135,11 +136,16 @@
@-${rpm} -Vp tmp/manifest > /dev/null
@${rpm} -e probes
@${rpm} -e devtool-sanity
- @-${rpm} -qp ref/cAos.i386.manifest > /dev/null
+# @${rpm} -e --justdb `${rpm} -qa` --allmatches
+
+check-jbj:
+ @${rpm} -qp ref/cAos.i386.manifest > /dev/null
@-${rpm} -qp $(POPTURI)popt-1.14-1.i386.rpm > /dev/null
@-${rpm} -qW $(POPTURI) > /dev/null 2>&1
@-${rpm} -qW ftp://localhost/pub/i386-linux/RPMS > /dev/null 2>&1
- @${rpm} -e --justdb `${rpm} -qa` --allmatches
+
+check-local: check-init check-pubkeys check-markup \
+ check-build check-install check-query check-jbj
clean-local:
rm -rf tmp $(BUILD_DIRS) $(patsubst %,%.spec,$(BUILD_DIRS))
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/.alldigests
============================================================================
$ cvs diff -u -r1.11 -r1.12 .alldigests
--- rpm/tests/ref/.alldigests 16 Jun 2008 19:58:51 -0000 1.11
+++ rpm/tests/ref/.alldigests 30 Jul 2008 12:14:12 -0000 1.12
@@ -1,22 +1,22 @@
-md2:420dd6052f97b71534d8d5154f798995 ref/cAos.i386.manifest
-md4:f0e4addd20595577c679d6ab0578ca11 ref/cAos.i386.manifest
-md5:23335894a6967e57816d33cdbbde4a56 ref/cAos.i386.manifest
-sha1:be72ffb3fc9ddb1d4f821d7ab13a12bc7c8c9664 ref/cAos.i386.manifest
-sha224:c2e86c0ce10d978e03c59e69d8509681d5321ab693e4ccfbca9d3c33
ref/cAos.i386.manifest
-sha256:860beabca94f2a47b078bd1a9b0fea88efab5a69ff77d91c409efcf776be9686
ref/cAos.i386.manifest
-sha384:fc3a595cb1692566a648462ebba0dfbd11d0bdb2fab4a3743971e9a9e3ee1c57dec7273b1e008c2941761d8c330b9e3a
ref/cAos.i386.manifest
-sha512:364ffead173f4e04db51d73c2554f9ab20899562d480fa7029dfe27ecfe6d5fc24f7d7074f67e556a4dffc221bc0a7596da2833c1fbfd1074c0fffb5bd9b82d0
ref/cAos.i386.manifest
-salsa10:06df03b16a8b7fb23a8512f3201086dedff2ffe18e2c39ee88d2279ebf72f2f78e417f47f425e04bc464842b4e001b08894bc2f61f25cc7ecb8897068428a34f
ref/cAos.i386.manifest
-salsa20:0ea3532a4d0a10205a00cbe748427c259c54da83bd53cb5b26ab4c7e3bd9b693de4c2daa123c12f41adcb4cfe5070ca9e554840e1165f15dffffa3062ad41dfd
ref/cAos.i386.manifest
-rmd128:63b454d0373c1bb4df60aa05a1c3f52d ref/cAos.i386.manifest
-rmd160:76db640680392105f7647ad4e8321a51b2368708 ref/cAos.i386.manifest
-rmd256:b2dc37cbb99de77ce6e0cec24a38b1d35e76603695b3a065a028aeb8b6137efe
ref/cAos.i386.manifest
-rmd320:babd26dcabf247c71db236ac32d4554324a10ae345cde640dd678422558f095815d43e2f57c8c622
ref/cAos.i386.manifest
-tiger:30ba3f691c7d9039c152329a8799d35024986006f58aa6b7
ref/cAos.i386.manifest
-crc32:327613f7 ref/cAos.i386.manifest
-crc64:bb5e0e19532d1a57 ref/cAos.i386.manifest
-adler32:528a35b9 ref/cAos.i386.manifest
-jlu32:e997aada ref/cAos.i386.manifest
+md2:bc73129d4e085a7fc6855229f6cd6a07 ref/cAos.i386.manifest
+md4:ee0b08300b409ccf9d9ad2fcbe2bf3df ref/cAos.i386.manifest
+md5:c702512431a26602340ccf07f5e114d9 ref/cAos.i386.manifest
+sha1:822b082f4c2ce9a7f45accd5ee99e86bad704ffb ref/cAos.i386.manifest
+sha224:855debc347373c78de0927c354dbf94ab2bdd0ccb9c8606eaaf937f3
ref/cAos.i386.manifest
+sha256:8d48f22b0cba5c0aad56dabcfc003bd7c2d708006e4d92b1b78f06ed66341674
ref/cAos.i386.manifest
+sha384:02fcedbaf4af74bdcfd33e58c90ca77af18d46509775c662a5389e5dbf5b818598e9d18e9b3e338ca9349996630040cf
ref/cAos.i386.manifest
+sha512:bb84296d1796dcd38098bd71bd13a58acc02c4ff8f26adc6ddb828ce22eb54e961ed91b96c68d0cc2fdefbe61de3db37c4fc32b2cbf2fa1b0154812283741c9a
ref/cAos.i386.manifest
+salsa10:2c4ed82198059fe28145b657c2818c172a21a283ef53abf5bc2aa4239f4f12defb18a1a6be2be7091f38c00e58aed086e84170029f63fbafa37ea38caa175751
ref/cAos.i386.manifest
+salsa20:0bb1cc43fbe287c86c64013e7c103878ba27834f4eeb9bedaf3b08d8083386a5728dc5dea2490ce40767b5d0e944670acb40287c65af919441bf5ceed8fa8eb0
ref/cAos.i386.manifest
+rmd128:0599deb5f6558712d858781ef3c4cdfe ref/cAos.i386.manifest
+rmd160:4c1490f3f93253e882d5baa8344b63d6c82cf2bc ref/cAos.i386.manifest
+rmd256:f511ee2b91c7e0606508979cb52b25164a312a8420fde756e33dc13469f660b5
ref/cAos.i386.manifest
+rmd320:85aa734937967e16ed25405b1e01dca90678b40abc78a5ba2d274a2b9511b56c6efd2948c4d5cf09
ref/cAos.i386.manifest
+tiger:99cebd302e32fa799c6c0994437f6f4da875fa3c5650eb48
ref/cAos.i386.manifest
+crc32:2987c2f8 ref/cAos.i386.manifest
+crc64:e162a09823b73d2c ref/cAos.i386.manifest
+adler32:bc4e3265 ref/cAos.i386.manifest
+jlu32:15e7c79f ref/cAos.i386.manifest
md2:09b74330e7dbaca60826d0c43422b818 ref/edos.qa.1
md4:cc95d7410fe89a2c60904cb19175c520 ref/edos.qa.1
md5:4952a933832a8f7b88f8ec0993228bb7 ref/edos.qa.1
@@ -283,25 +283,25 @@
crc64:78d006d5ebc0570c ref/repomd.xml
adler32:9e112467 ref/repomd.xml
jlu32:6f662ac3 ref/repomd.xml
-md2:ea78b2651b579bb803873a22566a95ec ref/showrc
-md4:b63262ad9279b36757716a55349325f4 ref/showrc
-md5:797208dd7338b530dc26c06b91a58947 ref/showrc
-sha1:df5abe194255d82b89a61bfd86096a91bff89349 ref/showrc
-sha224:16e0b25e34375b0d77d4202f68d2ff3a4b6122d7884662f88771fd57 ref/showrc
-sha256:31d211dbab3f3b636de9a6e69eaf93653681a600e92ef9008c6ec66a694bc4a4
ref/showrc
-sha384:2b8665d7cd99f5c013f874beac2aa7874124701e0421ea910c355564f1e8630238123ef263795d8e5e846b50b595fa21
ref/showrc
-sha512:e383f65e5383e4522d9e1a5920eb4f1b04a682b55cc2836f58a254282945a068770c73808a0aaaa7b281e4c9dd045b75f9243d6a8b0beda7aacb50e9baea6ce7
ref/showrc
-salsa10:d9d498d7965a5721e5e89a37ec69b40d5caae6422e778078afe6a9de7fc876bd2a3190589f7aefdf412f06367c58f76f9223ea6ab4b2f4a7988f68a0d924b990
ref/showrc
-salsa20:4fb70b064306d444b28ada6582d46eba25d1bb26c4fd7ed5277e6d5449489c3187f86fe65028e16621eeb20884004f3149910f2c58dc1128ae9c525621920208
ref/showrc
-rmd128:e07c57b06ebaef74e3dfa5c7cffa0e58 ref/showrc
-rmd160:a2fa639403b0f95c4687a05b970b587b5d35a603 ref/showrc
-rmd256:67aa4005d9a5aeeb2d2951760aeffd5b7f72c063fa7b00b2b1431b2bf6bbbf32
ref/showrc
-rmd320:b217df922f3d3e36cba3a9cba8866a236c21206086c2a821c673f871a3cc2592c57c0796a8d7395f
ref/showrc
-tiger:b3cfb91cf77cad2c195d04b095ca33834300fb9cb78793d4 ref/showrc
-crc32:8ff59481 ref/showrc
-crc64:df7ecabb1cf9e176 ref/showrc
-adler32:add249f8 ref/showrc
-jlu32:ce2973e1 ref/showrc
+md2:bda2e16102613288536ffef55d9d697e ref/showrc
+md4:bbd290700c4fddd35b790488ade76775 ref/showrc
+md5:5252bbb1dfed3095d8a6d9fd35018817 ref/showrc
+sha1:587fd45d417dcd4453d8fe5ebc0a1a0e88db0f66 ref/showrc
+sha224:4fa7d489f3ad186104b7330698c79f8f72140aed427c9aa4fb56343f ref/showrc
+sha256:6e3334788bf4130102f1c29bc8d947155a980be2a61ecab86227771123e81a07
ref/showrc
+sha384:d7482f29ffea2f0ad2f3ee2f07e39dcb70c233147d1ca7c9a91d43da3dee84acf1a21d68450e76775243af1ba6486dd0
ref/showrc
+sha512:520edf0261004747d100438764187d3c679c7055368e0d0c8109e07894e581446668ab4738df7a81c4450da5873610702c967970324e1247848a558c31b12068
ref/showrc
+salsa10:d99b04e7a0d3c04e7ae266a2954e95f1dadddb1844978a9300fc25f12ae349a19fac15cdf33156d68ab3a2530e3db254a7af31f3308371308fc088b60d983dd1
ref/showrc
+salsa20:83e1eb4564c0e8e6f853516b22b6132fac5a74e1a40e77f45c36518effcdfa6d4cf07436f4cd4e6a150c5cee2b58ce8cab7201ee2e79f84869d59c18fc33e334
ref/showrc
+rmd128:a41950754421ef0a25f04809863a6fb7 ref/showrc
+rmd160:3c643b9f2f37cfeb320a6f46aea2eb6c24fe4372 ref/showrc
+rmd256:af77feeddccfff8ffcf72a9b997c81b6cb31d556c9e2062da4f428230fe89a1c
ref/showrc
+rmd320:75c29f284fb04e582061ed01b7067480f9faa343a4872980fe90eb3d632e14d41630fdc84b5a4b9f
ref/showrc
+tiger:50533046ea25785017140a8287fc68e98072d609be275d14 ref/showrc
+crc32:b65b8e73 ref/showrc
+crc64:8347f765046786df ref/showrc
+adler32:ff186a10 ref/showrc
+jlu32:dabbb1c9 ref/showrc
md2:702d78dbf9033f52c9263253e626c5be ref/version
md4:75e0e6207421a7c860d7cd4c8e19695f ref/version
md5:063c879105b7acac5340b506fe5df7ec ref/version
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/showrc
============================================================================
$ cvs diff -u -r1.5 -r1.6 showrc
--- rpm/tests/ref/showrc 16 Jun 2008 18:25:52 -0000 1.5
+++ rpm/tests/ref/showrc 30 Jul 2008 12:14:12 -0000 1.6
@@ -27,6 +27,50 @@
rpmlib(ScriptletInterpreterArgs) = 4.0.3-1
rpmlib(VersionedDependencies) = 3.0.3-1
+Features provided by current cpuinfo (from /proc/cpuinfo):
+ cpuinfo(acpi)
+ cpuinfo(apic)
+ cpuinfo(bogomips) = 4792.95
+ cpuinfo(bts)
+ cpuinfo(cache_size) = 512_KB
+ cpuinfo(cid)
+ cpuinfo(clflush)
+ cpuinfo(clflush_size) = 64
+ cpuinfo(cmov)
+ cpuinfo(cpu_MHz) = 2394.274
+ cpuinfo(cpu_family) = 15
+ cpuinfo(cx8)
+ cpuinfo(de)
+ cpuinfo(dts)
+ cpuinfo(fpu)
+ cpuinfo(fpu_exception)
+ cpuinfo(fxsr)
+ cpuinfo(ht)
+ cpuinfo(mca)
+ cpuinfo(mce)
+ cpuinfo(mmx)
+ cpuinfo(model) = 2
+ cpuinfo(msr)
+ cpuinfo(mtrr)
+ cpuinfo(pae)
+ cpuinfo(pat)
+ cpuinfo(pbe)
+ cpuinfo(pebs)
+ cpuinfo(pge)
+ cpuinfo(pse)
+ cpuinfo(pse36)
+ cpuinfo(ss)
+ cpuinfo(sse)
+ cpuinfo(sse2)
+ cpuinfo(stepping) = 9
+ cpuinfo(sync_rdtsc)
+ cpuinfo(tm)
+ cpuinfo(tsc)
+ cpuinfo(up)
+ cpuinfo(vme)
+ cpuinfo(wp)
+ cpuinfo(xtpr)
+
========================
-14: GNUconfigure(MCs:)
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS;
@@ -449,6 +493,9 @@
%{?_dependency_whiteout_system}
%{nil}
-14: _dependency_whiteout_caos_core
+ perl>perl-Filter
+ pam>coreutils
+ pam>initscripts
glibc-common>glibc
glibc>nscd
-14: _disable_shell_interpreter_deps 0
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
