From dc7ee4090deb5638aee8837f7cad73840cf74e5f Mon Sep 17 00:00:00 2001 From: jbj Date: Thu, 19 Nov 1998 18:10:28 +0000 Subject: finish hiding rpmdb index record data ("matches"). CVS patchset: 2543 CVS date: 1998/11/19 18:10:28 --- tests/hello-test/ckH.exp | 28 +++++++++++++++------------- tests/hello-test/ckS.exp | 6 +++--- tests/hello-test/e.exp | 2 +- tests/hello-test/i | 1 + tests/hello-test/i.exp | 8 ++++---- tests/hello-test/qi.exp | 6 +++--- tests/hello-test/showrc.exp | 33 ++++++++++++++++++++++++--------- tests/hello-test/test0.exp | 11 +++++++++++ 8 files changed, 62 insertions(+), 33 deletions(-) (limited to 'tests/hello-test') diff --git a/tests/hello-test/ckH.exp b/tests/hello-test/ckH.exp index b37d7542e..4baa67706 100644 --- a/tests/hello-test/ckH.exp +++ b/tests/hello-test/ckH.exp @@ -1,4 +1,4 @@ -Entry count: 52 +Entry count: 53 CT TAG TYPE OFSET COUNT Entry : 000 (100)(unknown) STRING_ARRAY_TYPE 0xffffffff 00000001 @@ -16,11 +16,11 @@ Entry : 005 (1004)RPMTAG_SUMMARY I18N_STRING_TYPE 0xffffffff 00000001 Entry : 006 (1005)RPMTAG_DESCRIPTION I18N_STRING_TYPE 0xffffffff 00000001 Data: 000 Simple rpm demonstration. Entry : 007 (1006)RPMTAG_BUILDTIME INT32_TYPE 0xffffffff 00000001 - Data: 000 0x362cd576 (908907894) + Data: 000 0x36545684 (911496836) Entry : 008 (1007)RPMTAG_BUILDHOST STRING_TYPE 0xffffffff 00000001 Data: 000 krusty.devel.redhat.com Entry : 009 (1009)RPMTAG_SIZE INT32_TYPE 0xffffffff 00000001 - Data: 000 0x00007c67 (31847) + Data: 000 0x000099a8 (39336) Entry : 010 (1010)RPMTAG_DISTRIBUTION STRING_TYPE 0xffffffff 00000001 Data: 000 RPM test suite. Entry : 011 (1011)RPMTAG_VENDOR STRING_TYPE 0xffffffff 00000001 @@ -44,7 +44,7 @@ Entry : 018 (1027)RPMTAG_FILENAMES STRING_ARRAY_TYPE 0xffffffff 00000003 Entry : 019 (1028)RPMTAG_FILESIZES INT32_TYPE 0xffffffff 00000003 Data: 000 0x00000400 (1024) Data: 001 0x00000024 (36) - Data: 002 0x00007843 (30787) + Data: 002 0x00009584 (38276) Entry : 020 (1030)RPMTAG_FILEMODES INT16_TYPE 0xffffffff 00000003 Data: 000 0x41ed (16877) Data: 001 0xffff81a4 (-32348) @@ -54,13 +54,13 @@ Entry : 021 (1033)RPMTAG_FILERDEVS INT16_TYPE 0xffffffff 00000003 Data: 001 0x0000 (0) Data: 002 0x0000 (0) Entry : 022 (1034)RPMTAG_FILEMTIMES INT32_TYPE 0xffffffff 00000003 - Data: 000 0x362cd571 (908907889) + Data: 000 0x3654567f (911496831) Data: 001 0x362ca336 (908895030) - Data: 002 0x362cd571 (908907889) + Data: 002 0x3654567f (911496831) Entry : 023 (1035)RPMTAG_FILEMD5S STRING_ARRAY_TYPE 0xffffffff 00000003 Data: 000 Data: 001 33cccc1f055d73acaceed7d8204e99c7 - Data: 002 741e702cdf114c95a9e965fa8aa40864 + Data: 002 dbf1372435b9a3d68d4f650b687f2081 Entry : 024 (1036)RPMTAG_FILELINKTOS STRING_ARRAY_TYPE 0xffffffff 00000003 Data: 000 Data: 001 @@ -84,7 +84,7 @@ Entry : 029 (1045)RPMTAG_FILEVERIFYFLAGS INT32_TYPE 0xffffffff 0000 Data: 001 0x00000000 (0) Data: 002 0xffffffff (-1) Entry : 030 (1046)RPMTAG_ARCHIVESIZE INT32_TYPE 0xffffffff 00000001 - Data: 000 0x00007aac (31404) + Data: 000 0x000097ec (38892) Entry : 031 (1047)RPMTAG_PROVIDES STRING_ARRAY_TYPE 0xffffffff 00000001 Data: 000 hi Entry : 032 (1048)RPMTAG_REQUIREFLAGS INT32_TYPE 0xffffffff 00000003 @@ -106,7 +106,7 @@ Entry : 036 (1054)RPMTAG_CONFLICTNAME STRING_ARRAY_TYPE 0xffffffff 0000000 Entry : 037 (1055)RPMTAG_CONFLICTVERSION STRING_ARRAY_TYPE 0xffffffff 00000001 Data: 000 Entry : 038 (1064)RPMTAG_RPMVERSION STRING_TYPE 0xffffffff 00000001 - Data: 000 2.90 + Data: 000 2.5.6 Entry : 039 (1080)RPMTAG_CHANGELOGTIME INT32_TYPE 0xffffffff 00000001 Data: 000 0x362cf9d0 (908917200) Entry : 040 (1081)RPMTAG_CHANGELOGNAME STRING_ARRAY_TYPE 0xffffffff 00000001 @@ -124,18 +124,20 @@ Entry : 045 (1088)RPMTAG_POSTUNPROG STRING_TYPE 0xffffffff 00000001 Entry : 046 (1090)RPMTAG_OBSOLETES STRING_ARRAY_TYPE 0xffffffff 00000001 Data: 000 howdy Entry : 047 (1094)RPMTAG_COOKIE STRING_TYPE 0xffffffff 00000001 - Data: 000 krusty.devel.redhat.com 908907894 + Data: 000 krusty.devel.redhat.com 911496836 Entry : 048 (1095)RPMTAG_FILEDEVICES INT32_TYPE 0xffffffff 00000003 Data: 000 0x00000804 (2052) Data: 001 0x00000804 (2052) Data: 002 0x00000804 (2052) Entry : 049 (1096)RPMTAG_FILEINODES INT32_TYPE 0xffffffff 00000003 - Data: 000 0x000194d7 (103639) - Data: 001 0x000194d8 (103640) - Data: 002 0x00010de9 (69097) + Data: 000 0x0001b49e (111774) + Data: 001 0x0001b49f (111775) + Data: 002 0x0001a4e3 (107747) Entry : 050 (1097)RPMTAG_FILELANGS STRING_ARRAY_TYPE 0xffffffff 00000003 Data: 000 Data: 001 Data: 002 Entry : 051 (1098)RPMTAG_PREFIXES STRING_ARRAY_TYPE 0xffffffff 00000001 Data: 000 /usr +Entry : 052 (1105)RPMTAG_CAPABILITY INT32_TYPE 0xffffffff 00000001 + Data: 000 0x00000000 (0) diff --git a/tests/hello-test/ckS.exp b/tests/hello-test/ckS.exp index e90798c94..f55a05433 100644 --- a/tests/hello-test/ckS.exp +++ b/tests/hello-test/ckS.exp @@ -2,7 +2,7 @@ Entry count: 2 CT TAG TYPE OFSET COUNT Entry : 000 (1000)RPMTAG_NAME INT32_TYPE 0xffffffff 00000001 - Data: 000 0x00003178 (12664) + Data: 000 0x000041c3 (16835) Entry : 001 (1004)RPMTAG_SUMMARY BIN_TYPE 0xffffffff 00000016 - Data: 000 4f a6 f0 cc 7c b3 27 61 - Data: 008 09 35 67 1d e1 77 8b 68 + Data: 000 15 ffffffb1 ffffffad ffffffc7 03 ffffffb6 53 33 + Data: 008 27 52 52 ffffffad fffffff7 1f ffffffb2 25 diff --git a/tests/hello-test/e.exp b/tests/hello-test/e.exp index 89f331cc9..6bbc5b64c 100644 --- a/tests/hello-test/e.exp +++ b/tests/hello-test/e.exp @@ -1,7 +1,7 @@ D: counting packages to uninstall D: opening database in //var/lib/rpm/ D: found 1 packages to uninstall -D: uninstalling record number 1752 +D: uninstalling record number 24 D: will remove files test = 0 D: /hello-test/../usr/local/bin/hello - removing D: /usr/doc/hello-1.0/FAQ - removing diff --git a/tests/hello-test/i b/tests/hello-test/i index 943c221ff..cd810ceeb 100755 --- a/tests/hello-test/i +++ b/tests/hello-test/i @@ -4,6 +4,7 @@ rpm=${rpm:=rpm} destdir="`pwd`" destdir="`dirname $destdir`" +rm -rf $destdir/var/lib/rpm/* $rpm -i -vv --nodeps --prefix="`pwd`/../usr" $myrpm | \ sed -e "s,$destdir,,g" > $0.out diff --git a/tests/hello-test/i.exp b/tests/hello-test/i.exp index 0ff27b996..1760e6e0f 100644 --- a/tests/hello-test/i.exp +++ b/tests/hello-test/i.exp @@ -7,8 +7,8 @@ D: New Header signature D: Signature size: 68 D: Signature pad : 4 D: sigsize : 72 -D: Header + Archive: 13492 -D: expected size : 13492 +D: Header + Archive: 16835 +D: expected size : 16835 D: found 0 source and 1 binary packages D: opening database mode: 01002 D: opening database in //var/lib/rpm/ @@ -18,8 +18,8 @@ D: New Header signature D: Signature size: 68 D: Signature pad : 4 D: sigsize : 72 -D: Header + Archive: 13492 -D: expected size : 13492 +D: Header + Archive: 16835 +D: expected size : 16835 D: package: hello-1.0-1 files test = 0 D: relocating /usr/local/bin/hello to /hello-test/../usr/local/bin/hello D: running preinstall script (if any) diff --git a/tests/hello-test/qi.exp b/tests/hello-test/qi.exp index c3800a07f..5da1a8652 100644 --- a/tests/hello-test/qi.exp +++ b/tests/hello-test/qi.exp @@ -1,9 +1,9 @@ Name : hello Distribution: RPM test suite. Version : 1.0 Vendor: Red Hat Software -Release : 1 Build Date: Tue Oct 20 14:21:44 1998 -Install date: Tue Oct 20 14:21:47 1998 Build Host: krusty.devel.redhat.com +Release : 1 Build Date: Thu Nov 19 12:33:56 1998 +Install date: Thu Nov 19 12:34:00 1998 Build Host: krusty.devel.redhat.com Group : Utilities Source RPM: hello-1.0-1.src.rpm -Size : 31847 License: GPL +Size : 39336 License: GPL Packager : Red Hat Software URL : http://www.redhat.com Summary : hello -- hello, world rpm diff --git a/tests/hello-test/showrc.exp b/tests/hello-test/showrc.exp index db538f8ee..b4429d6b9 100644 --- a/tests/hello-test/showrc.exp +++ b/tests/hello-test/showrc.exp @@ -1,29 +1,44 @@ ARCHITECTURE AND OS: -build arch : i386 -compatible build archs: i386 noarch +build arch : sparc +compatible build archs: sparc noarch build os : Linux -compatible build os's : linux -install arch : i386 +compatible build os's : Linux +install arch : sparc install os : Linux -compatible archs : i386 noarch -compatible os's : linux - +compatible archs : sparc noarch +compatible os's : Linux RPMRC VALUES: builddir : /usr/src/redhat/BUILD +buildroot : (not set) buildshell : /bin/sh bzip2bin : /usr/bin/bzip2 dbpath : /var/lib/rpm defaultdocdir : /usr/doc +distribution : (not set) +excludedocs : (not set) fixperms : a+rX,g-w,o-w +ftpport : (not set) +ftpproxy : (not set) gzipbin : /bin/gzip instchangelog : 5 -macrofiles : /usr/lib/rpm/macros -optflags : -O2 -m486 -fno-strength-reduce +langpatt : (not set) +messagelevel : (not set) +netsharedpath : (not set) +optflags : -O2 +packager : (not set) +pgp_name : (not set) +pgp_path : (not set) +provides : (not set) +require_distribution : (not set) +require_icon : (not set) +require_vendor : (not set) rpmdir : /usr/src/redhat/RPMS rpmfilename : %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm signature : none sourcedir : /usr/src/redhat/SOURCES specdir : /usr/src/redhat/SPECS srcrpmdir : /usr/src/redhat/SRPMS +timecheck : (not set) tmppath : /var/tmp topdir : /usr/src/redhat +vendor : (not set) diff --git a/tests/hello-test/test0.exp b/tests/hello-test/test0.exp index 45b5ea403..f649abe2b 100644 --- a/tests/hello-test/test0.exp +++ b/tests/hello-test/test0.exp @@ -27,8 +27,19 @@ Executing: %install install -m 0755 hello /var/tmp/hello-root/usr/local/bin + exit 0 Processing files: hello +Executing: %doc ++ umask 022 ++ cd /usr/src/redhat/BUILD ++ cd hello-1.0 ++ DOCDIR=/var/tmp/hello-root/usr/doc/hello-1.0 ++ export DOCDIR ++ rm -rf /var/tmp/hello-root/usr/doc/hello-1.0 ++ /bin/mkdir -p /var/tmp/hello-root/usr/doc/hello-1.0 ++ cp -pr FAQ /var/tmp/hello-root/usr/doc/hello-1.0 ++ exit 0 Finding provides... Finding requires... +Prereqs: /bin/sh Requires: ld-linux.so.2 libc.so.6 Wrote: /usr/src/redhat/SRPMS/hello-1.0-1.src.rpm Wrote: /usr/src/redhat/RPMS/sparc/hello-1.0-1.sparc.rpm -- cgit v1.2.3