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: 20-May-2008 16:31:49
Branch: rpm-5_1 Handle: 2008052014314900
Added files: (Branch: rpm-5_1)
rpm/tests devtool-sanity-1.0-1.src.rpm
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/tests Makefile.am
Log:
- jbj: backport top level tests/* for "make check". No tests in Makefile
SUBDIRS targets yet ...
Summary:
Revision Changes Path
1.2288.2.26 +2 -0 rpm/CHANGES
1.9.4.1 +55 -14 rpm/tests/Makefile.am
1.1.2.2 BLOB rpm/tests/devtool-sanity-1.0-1.src.rpm
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.25 -r1.2288.2.26 CHANGES
--- rpm/CHANGES 19 May 2008 20:57:21 -0000 1.2288.2.25
+++ rpm/CHANGES 20 May 2008 14:31:49 -0000 1.2288.2.26
@@ -1,4 +1,6 @@
5.1.1 -> 5.1.2:
+ - jbj: backport top level tests/* for "make check". No tests in Makefile
+ SUBDIRS targets yet ...
- jbj: rpmrepo: add doxygen markup throughout, adjust splint annotations.
- jbj: update i18n from Translation Project.
- jbj: update po/POTFILES.in
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.9 -r1.9.4.1 Makefile.am
--- rpm/tests/Makefile.am 16 Jul 2007 09:22:48 -0000 1.9
+++ rpm/tests/Makefile.am 20 May 2008 14:31:49 -0000 1.9.4.1
@@ -2,22 +2,63 @@
AUTOMAKE_OPTIONS = 1.4 foreign
-pkglibdir = @USRLIBRPM@
-
EXTRA_DIST =
-SUBDIRS = hello-test
+SUBDIRS =
+
+macros = $(abs_top_builddir)/macros:@testdir@/macros
+rpm = $(abs_top_builddir)/rpm --macros $(macros)
+rpm2cpio = $(abs_top_builddir)/tools/rpm2cpio
+cpio = cpio
+
+%.spec: $(wildcard %-*.src.rpm)
+ @${rpm2cpio} $(wildcard $*-*.src.rpm) | ${cpio} -i --quiet $@
+
+%.src.rpm: $(wildcard *.spec)
+ @${rpm} -bs --nodeps $^
+
+BUILD_DIRS = $(shell ${rpm} -qp --qf '%{NAME} ' --nosignature $(wildcard
*.src.rpm))
-check-recursive: ./usr/ ./bin ./var
+$(BUILD_DIRS): $(wildcard %-*.src.rpm)
+ ${rpm} -i --nosignature --nodeps [EMAIL PROTECTED]
+ (cd $@ && ${rpm} -q --specfile [EMAIL PROTECTED] && ${rpm} -q
--specsrpm [EMAIL PROTECTED] && ${rpm} -q --specfile --specedit [EMAIL
PROTECTED] && ${rpm} -bb --nodeps [EMAIL PROTECTED]) > /dev/null
-./usr ./bin ./var: ../rpm
- ${MAKE} -C .. DESTDIR=`pwd` install
- cp macros ./$(pkglibdir)
- rm -f ./@GZIPBIN@
- if [ ! -d ./`dirname @[EMAIL PROTECTED] ] ; then mkdir -p ./`dirname
@[EMAIL PROTECTED] ; fi
- ln -s @GZIPBIN@ ./@GZIPBIN@
- rm -f ./@BZIP2BIN@
- if [ ! -d ./`dirname @[EMAIL PROTECTED] ] ; then mkdir -p ./`dirname
@[EMAIL PROTECTED] ; fi
- ln -s @BZIP2BIN@ ./@BZIP2BIN@
+check-local: $(BUILD_DIRS)
+ @${rpm} -v --version > /dev/null
+ @${rpm} -v --showrc > /dev/null
+ @-rm -rf rpm
+ @${rpm} --initdb
+ @${rpm} --import $(top_srcdir)/pubkeys/JBJ-GPG-KEY
+ @${rpm} -qW . > /dev/null 2>&1
+ @${rpm} -Kv *.src.rpm */*.rpm > /dev/null
+ @${rpm} -Kv --usecrypto beecrypt *.src.rpm */*.rpm > /dev/null
+ @-${rpm} -U --justdb */*.rpm > /dev/null 2>&1
+ @${rpm} -Uvh --justdb --nodeps */*.rpm > /dev/null
+ @-${rpm} -i --justdb --nodeps */*.rpm > /dev/null 2>&1
+ @${rpm} -qa > /dev/null
+ @${rpm} -qa 'arch=noarch' > /dev/null
+ @${rpm} -qa 'arch=!noarch' > /dev/null
+ @${rpm} -qa -c > /dev/null
+ @${rpm} -qa -d > /dev/null
+ @${rpm} -qa -s > /dev/null
+ @${rpm} -qa --dump > /dev/null
+ @${rpm} -q --querybynumber 1 > /dev/null
+ @${rpm} -qal > /dev/null
+ @${rpm} -qa --qf '[%{FSNAMES}: %{FSSIZES}\n]' > /dev/null
+ @${rpm} -qa --qf '[%{FILENAMES}: %{FILECLASS}\n]' > /dev/null
+ @${rpm} -qa --qf '[%{FILENAMES}: %{FILECONTEXTS}\n]' > /dev/null
+ @${rpm} -qa --qf '[%{FILENAMES}: %{FSCONTEXTS}\n]' > /dev/null
+ @${rpm} -qa --qf '[%{FILENAMES}: %{RECONTEXTS}\n]' > /dev/null
+ @${rpm} -qa --qf '[%{FILENAMES}: %{FILEPROVIDE}\n]' > /dev/null
+ @${rpm} -qa --qf '[%{FILENAMES}: %{FILEREQUIRE}\n]' > /dev/null
+ @${rpm} -qa --qf '[%{MISSINGOK}\n]' > /dev/null
+ @@${rpm} -qa --qf '[%{*:xml}\n]' > /dev/null
+ @${rpm} --rebuilddb
+ @${rpm} -qa --qf '[%{*:yaml}\n]' > /dev/null
+ @-${rpm} -Va > /dev/null
+ @${rpm} -e --justdb `${rpm} -qa` --allmatches
+ @-${rpm} -qp http://rpm5.org/files/popt/popt-1.14-1.i386.rpm > /dev/null
+ @-${rpm} -qW http://rpm5.org/files/popt/ > /dev/null 2>&1
+ @-${rpm} -qW ftp://localhost/pub/i386-linux/RPMS > /dev/null 2>&1
clean-local:
- rm -rf ./usr ./bin ./var
+ rm -rf rpm tmp $(BUILD_DIRS) $(patsubst %,%.spec,$(BUILD_DIRS))
@@ .
(cd rpm/tests && \
uudecode <<'@@ .' && \
xdelta patch devtool-sanity-1.0-1.src.rpm.xdelta /dev/null
devtool-sanity-1.0-1.src.rpm && \
rm -f devtool-sanity-1.0-1.src.rpm.xdelta)
Index: rpm/tests/devtool-sanity-1.0-1.src.rpm
============================================================================
begin 664 devtool-sanity-1.0-1.src.rpm.xdelta
M)5A$6C`P-"4````(`!$`$`````````````````````!S:&EE;&$N-S0T,C,N
M;G5L;'-H:65L82XW-#0R,RYA;&[EMAIL PROTECTED]<!17'[EMAIL PROTECTED](
MF]JRH:2$,I?[$2X_KB0T))<0"4E(`I41W-G;?7>WR?YR=^\XDIR6PF"LE):J
M5,.O3`>[EMAIL PROTECTED]'70MG8<?N@@%FAM"U7$^-[N]RY[EYC^X\UL
M[GV^W\_WUWO?]_9=KN^_\=XXZO_VR<\6;/GIU1P8CL?/#OS4X&<"?C;C9RI%
MY4P"3#Y+,)X"[EMAIL PROTECTED]'YN4N*
MSK12!?34HX;P`%-U>&OG>6KPP*RYR[=>N;[EMAIL PROTECTED];[G\
M/KO_C;D/O_OQL7//7ID>./8'EZ>BTE?E%<HJ*RK*RKG*$*HHYRMXK]<?+O/R
[EMAIL PROTECTED],[+2G'?C&[EMAIL PROTECTED]>_?*4?!EZ.]%!4;G^JUJ&AH4$[UXSY
MF$]14S;@[T5V/5,,X`CXF0B<5/UD/G(!_PWP-,#7`,]PS`^-GYF`KP.>#_@&
MS%<SX)[EMAIL PROTECTED];X(]`+@&^!/@KX,_`7!WP7]/V`_P-XBXWS\L#?#P$3W3CH!8)I
MP+L`%P!_$/`DF(\]@"<#/@UX"O#?!'P/Z,\"[EMAIL PROTECTED]'.`9P/\]X!+(]X^`&P!?
M`MQH\W-@/?*6`,X#W&3[SYD(^`G`I*Z%&*^V^9-3]:^Q]9-3]7\=\$'[EMAIL PROTECTED]
M\B'`"/`1P&'`QP'[EMAIL PROTECTED]/\(XIT$_#/`IP`?!)R:KT.`K?EJ>/W[B\&_-5]R
MX\!UP/[EMAIL PROTECTED](X24-Q45<EE<(IHKJ.\I1[*FQ(RMI`QD6%2G;H8%SDL,SE%X"15
M09:<[EMAIL PROTECTED])80DAL[0KU%6JZA&[[?O;8B%)Y)EZ5>9$A:I'
M<22IFHP4T]V)XQB4)"JQ!*6HG,Y'8:OTK_\%\;GGH7)OJ+)[EMAIL PROTECTED]
MZZ_R\95"53A4656^P.?E86\Q.")%'KP_A_REOM+ZX,I@,S4B(\;K\WJ\Y?XJ
MKY^83<REOO#D2:J89=E03)0$EM,C!NU"[EMAIL PROTECTED]"W1Q[R+6B`EJH+C7^DXR22+2
MD6Q$B<P:)!E[%%4-TT$`,[EMAIL PROTECTED]&R0\F"/,3&=A!'%A5AJ9Z))1YH:
MCDJCA&@R'J=41W0!P[2W+6,[6E>TUP79^J;VZMG%O3&?9A6CQG0>":*>3,X&
MWN(53<WU633+60:KM:V3;6BN;>[EMAIL PROTECTED]'\TEI:]OKEA`%2U9TV,8BLZK-
M0PE-U<VLU#(SR([EMAIL PROTECTED]&M]:UTJ6U90>9)[EMAIL PROTECTED];6.0;:E=%B1&
M"B>C=(HIY<I@>T=3:[EMAIL PROTECTED](>;[EMAIL PROTECTED]"0ASD#9<9V11O,^FCOL
M`?>'-=]6>PS/1WMK:^?PDJ09R>RHP^RD[8SMXN(<+W&&H7%F-%#77-O1T5;;
M:[EMAIL PROTECTED]>S"ZS5H3IZV,"6-%<V])873=L17":7]_4T=9<
MNRK%M;+!LQE2#10@>E<"MWA12H(2B&=J&#<^?=Q*#'<[\2-S1C?C\?GPF!>8
M41O2T>W6+K$VJX4MF&;;6XA$S%"[0Z+BQIN7N"'=RHH*/N,DR=Y0N#U$R=+)
MW3@<J]$6WP*,2R,*U<@TP:DRC#MFZ&Y)#+EU37:'=,W%JS+>BX;!C*XV3%W4
MQM+AOYPI\BZ2HAA'8U)Q+'*XNA35Q,[EMAIL PROTECTED]:Y)EPDR-,1G
M''S.<S"9Q8`IRCB#1G#P">2DZ"B;D5JUK,,NBV4B69,X$]$/%Q%JMGVR($M*
M`CEJMS2I=1JKLI%K2?J)%5`H%F'A;4=Z"B1.>C()_%$Z:5B5U2__,\E1)JX@
MXV@@2EU.,BX]S,[EMAIL PROTECTED]'[,"0<<FLY0C(WW>[EMAIL PROTECTED]'(CBJ&%$AEFEC
MKH%%&+NY;,H8O641/J\RBS1:6</6CII2,9T%Q0WKS4=[$F$/_F`167I:+*LL
MQV,[:%B4$"N($7Q?8CDIHM+>E`HO$,E.,56-'&8IL9TVG$Q8*'`F!U0</BPF
MDEC.Z>26(J`P%Y-,^\5'"'[EMAIL PROTECTED]:-A8215F5P23"15Q70#5\$B%P)JT1NG16V
M+R+"&O*Z<#BT\TJZ08P),J=D66()ED.)Q`J*=<[EMAIL PROTECTED]:O@,5XAYE\=+2<
M[,(MQQCA`R^JR@@*QD<@%A!6VB1K6LGZC92:^!*%3);78JD%`XDC(9"[EMAIL PROTECTED]
M^*PD!:3-DBX,[EMAIL PROTECTED]:ILTM[[)&7JK$(L[A>C$F4GL>W%]U&SKO7BMTN<D]
MVL`:7$BJO'1-M/.(QPKLB';C/V1HA:5U)$0YDV"[$^T.LGH>)#B7]/:WTK?S
M2B^`BRBH8C*FLWX/%.,VI\D;TV[WU#V/=K7Z&%>$<<EE^%LF'5]-)A"/S9B"
MJB-(03J^\+O"G+%.(7=;18T9KIBR5E0$E\F%)(0+AEL3V0UPQZ+)[P_X9&92
M2A:0HGA-5*E(CZA154#+*7F<HI)/[EMAIL PROTECTED];\<X'T5\-Z7I:H3!F*EF
M>JT3&2+C437C+_6$?)8TALWM3S43-4TMX"9._.0'A)OL9L/RB1\7MG%;)CJ*
MH`28$$4)2ZYY+#MO=2GNBM6ED9Z"9`'Y-6S_BV!HZ"[YB3YUUG?AOP/CGFE?
MWOT;S]0;QC>#??=)]QQYN>1+KTWXMF^\;]/TW1N?W_MJX;9'BI8AY8-?WSS_
MZ(9#ZR=</''\SHGC2R=N/SQOZ?W\<][7GD*B-_RMKP7>:[EMAIL PROTECTED]:]^YQE7QM]A_
M7UWT3OX/M$_.O,2]_LHG^XX>8EXLZ1'_/G#\[<WM/8^<V_5X]8)="S\J7'Q]
M7]^%[SUXM*'PP:?%LV^.O_?#O9?W"J[\JS4)95)Q_IJ!@:7+'MHARG]6Z<:V
M,Q<&DX=/GYAR3/WQHS-;OASN?&#+KN>V?['PXIY/*[\C[5SXE2UWUAU8>F#S
M)[EMAIL PROTECTED]<<[EMAIL PROTECTED](]T!_;MGK,Y<&O_[(&WF\X^O?P%>><U]Z9W-MR.
M;YM3,G#JS(K?[N\\M]&[EMAIL PROTECTED]<>Y6/^UY]]\H_WZ^Y]:?KEZ]M
MZ+M8>&%]\(F-=P9?**Q86;#U9,7YJ\=O%=5H:R[.[]QX\'?LT3,'_G+WR*7<
M(]M/7^YYY?[)XS_+?U'=T?+IS/Y<[EMAIL PROTECTED]'XL(`````````V-@
M:&!F8&!8X28<6/NM+3;<]W&[EMAIL PROTECTED]>30*$DN2,Q12$DL2-;$I8&1@
8F*\&`&S68P5"```````)<B581%HP,#0E
`
end
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
