From e37c80966bd7ef16893dcd2caf1b85ae89df0aa7 Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Thu, 1 Mar 2018 02:09:35 +0100 Subject: [PATCH] remake test0.zip and push to shipped test/test.zip #20 --- test/Makefile.am | 21 ++++++++++++++------- test/Makefile.in | 21 ++++++++++++++------- test/test.zip | Bin 1293 -> 1361 bytes test/test1.zip | Bin 1183 -> 0 bytes 4 files changed, 28 insertions(+), 14 deletions(-) delete mode 100644 test/test1.zip diff --git a/test/Makefile.am b/test/Makefile.am index f493b07..fc4ae2e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,8 +3,8 @@ AUTOTOOL_VERSION=autoconf-2.52 automake-1.5 libtool-1.4.2 DEFAULT_INCLUDES = # nothing - no default of -I. -I$(srcdir) DEFS = @DEFS@ -I$(top_builddir) -I$(top_srcdir) # also for automake 1.4 -EXTRA_DIST = test.zip test1.zip zziptests.py -DISTCLEANFILES = test*.dat test2.zip test3.zip +EXTRA_DIST = test.zip zziptests.py +DISTCLEANFILES = test*.dat test0.zip test1.zip test2.zip test3.zip zzcat = ../bins/zzcat$(EXEEXT) zzdir = ../bins/zzdir$(EXEEXT) @@ -24,9 +24,16 @@ testdatadir = $(top_builddir)/testdata.d testzip testzips : test.zip test1.zip test2.zip test3.zip -test.zip tmp/../test.zip : $(README) +test0.zip: $(README) - test -d tmp || mkdir tmp - - $(MAKE) test0.zip && mv test0.zip $@ + - cp $(README) tmp/README + - rm $@ + - cd tmp && zip ../test0.zip README + - rm -r tmp + - test -s test0.zip && cp -v test0.zip $(srcdir)/test.zip + +test.zip: $(README) + - $(MAKE) test0.zip - test -s $@ || cp $(srcdir)/test.zip $@ # ------------------------------------------------------------------- @@ -40,13 +47,13 @@ check-tests: tests tests: @ test -f zziptests.py || cp -s -v $(srcdir)/zziptests.py . python zziptests.py --exeext "$(EXEEXT)" --topsrcdir "$(top_srcdir)" -test_%: +test_%: @ test -f zziptests.py || cp -s -v $(srcdir)/zziptests.py . python zziptests.py $@ -vvvv --exeext "$(EXEEXT)" --topsrcdir "$(top_srcdir)" check-readme : $(zzcat) test.zip - @ test -f test.zip || $(MAKE) tmp/../test.zip - test -s test.zip + @ test -f test.zip || $(MAKE) test0.zip + test -s test.zip || cp $(srcdir)/test.zip test.zip @ echo :$@: checking $(zzcat) test/README @ $(zzcat) test/README >test.out @ if diff test.out $(README) >$(NULL) \ diff --git a/test/Makefile.in b/test/Makefile.in index 5c0f42c..984db8e 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -345,8 +345,8 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.4 foreign AUTOTOOL_VERSION = autoconf-2.52 automake-1.5 libtool-1.4.2 DEFAULT_INCLUDES = # nothing - no default of -I. -I$(srcdir) -EXTRA_DIST = test.zip test1.zip zziptests.py -DISTCLEANFILES = test*.dat test2.zip test3.zip +EXTRA_DIST = test.zip zziptests.py +DISTCLEANFILES = test*.dat test0.zip test1.zip test2.zip test3.zip zzcat = ../bins/zzcat$(EXEEXT) zzdir = ../bins/zzdir$(EXEEXT) zziptest = ../bins/zziptest$(EXEEXT) @@ -664,9 +664,16 @@ $(zzcat) $(zzdir) $(zziptest) $(zzxorcat) $(zzxordir) $(xorcopy) : \ testzip testzips : test.zip test1.zip test2.zip test3.zip -test.zip tmp/../test.zip : $(README) +test0.zip: $(README) - test -d tmp || mkdir tmp - - $(MAKE) test0.zip && mv test0.zip $@ + - cp $(README) tmp/README + - rm $@ + - cd tmp && zip ../test0.zip README + - rm -r tmp + - test -s test0.zip && cp -v test0.zip $(srcdir)/test.zip + +test.zip: $(README) + - $(MAKE) test0.zip - test -s $@ || cp $(srcdir)/test.zip $@ check-local: check-readme $(sfxtests) $(newtests) @@ -675,13 +682,13 @@ check-tests: tests tests: @ test -f zziptests.py || cp -s -v $(srcdir)/zziptests.py . python zziptests.py --exeext "$(EXEEXT)" --topsrcdir "$(top_srcdir)" -test_%: +test_%: @ test -f zziptests.py || cp -s -v $(srcdir)/zziptests.py . python zziptests.py $@ -vvvv --exeext "$(EXEEXT)" --topsrcdir "$(top_srcdir)" check-readme : $(zzcat) test.zip - @ test -f test.zip || $(MAKE) tmp/../test.zip - test -s test.zip + @ test -f test.zip || $(MAKE) test0.zip + test -s test.zip || cp $(srcdir)/test.zip test.zip @ echo :$@: checking $(zzcat) test/README @ $(zzcat) test/README >test.out @ if diff test.out $(README) >$(NULL) \ diff --git a/test/test.zip b/test/test.zip index 8923726372bf45e86625014038266afa6b13ff64..ffa4e6b5fecdb89058204fe523ed9967c83a4986 100644 GIT binary patch literal 1361 zcmV-X1+Mx~O9KQH000080ND^>Oh;PzJFf%)05b^y00saY08&LkL`_9iR0#kBDpHqP zDpHqPb$AN^0R-s-000C40001eRZVZ>HW0n%SIlYA0$v5^v1p6BZtA%37ZUFRy)7+` zB{meP^23hv>-P;QC*Bn8C5}XK=FNL=X0{KTKksI{8=_su^zxzyqxUp;chn6B@~j$C zbk-bs)7qCYF1=l%5?h)jK`1$nh zExAK};|BIB3exdC+oSf*_H1Kyb2I(4yWc#FlmNruTt_;oK)~E;KtLrYz>jPN_0IL0 zHpXb9CS+7(kH5Y}y$Ip?>dSf3jicYa>R9&^Qnn#}#+j6#;nvPZulGqR6@n2!@Sa)u z%>Tg|<4)DLf#|1J9-Cj={<&)S7wVj8LMc5NgBZ0N&Vb%Ui4m`K4la3Ui<)Pf?O%)a z{GAVa5WHuoDxyO;6rO^ts z#t-1L@Kw>&;KxFfV`fdluiT3^MqO^3@pi4OK&m?z*j5?sSOsjr1s)a>ld16dbQOAkXelYH2_Mjtdc2veMX0uV{6S_RV=2EI)IW&CJ1_ygf; zJ?P@5=Y*C1KJtHe2rtL+mw2IpS+vvi#EjTjVyE$0C16M#$#H5R3~ zCsL6bSBG0s7oS#L>@y5B3!idzp}J^bN~7dZ2+}F(sT0(d3n7B|S|I4c(1}s+HB*<* zA(TDiSAc{8MWWX42Bn+tFGPfkK$cq3j7&C{WYDL=<{fv%?aR@)&-nKxJ_7&#SZQGRY zxgAsf2Y`2N57$XWp#CwN?hl7X&jpUIg(6ADh?2ID?<6%ck8!JTs4PeNh>u}CExhh^ z#ATOali5P|=Sb7-B9|{lsXJv`ob{>h2qU)U>;u@}QOj}6ExmL_fU?$MYO=ry6I2rG zBE!hzSRzDNtRHvN<#M`PY}W61xbCfe(k2!)TboFw=%RBb?v%0!T`vI$ilD$+zLsL=_fZFKEja0k)mvzGd1D9~%pqf!Pqtw4jhxCOt3lLb;d+!<9&->)|NhWQWoKD@a+;b~RnBcX#XQdiK7@F2hEAXt9M} zYgafzlb$%Ys+{?Q63aP6z~#b0nY}PUC!TO+{5y1posoQkPnFcnbgl1nC0+00aO4002-+1qJ{B T000310RT(@008d<00000aDsLR delta 1286 zcmV+h1^N2X3XKYXP)h>@6aWAK2mm065-(OHelvXp008F*000I66#!C2K}1bORa6N8 z11su4KP&1$KUH`H0Q3O>0DV%t#F;$5J(rKPdN zh9XsxvZMU^z9FU9n*u%TIubRHZ{EC_d3fCadA~f&hz<>Z)9b75j6PE5-C0*0$g`?Q zl_iHj(GiY2uIQu<&a@>ZZ$2ttHu}tSfb>Dzno8Gp9wFLUI;wz(;0&9A@O<*jq)hF+ zj!he;t13DU^oqL+psXXl2<}Ql(W$p(1fDWF4noD9*&BsFL3<>Sc?}_Q3y=%&)9Ljs zxl?-MI`%4m3e)jD+q3r0wrpcDn=QT^KJOn#NxS6x&hRiC>Zgk&cXE_wMEX${lj1D z-RhkWS_ph(R8@+O!XfbM;sh z2Qm(S1y@;^?Zbu|Z6oPG)y?=L`Q{Af1# z18}A8bavBby}aK&Wo_3d8eE@pkXxav;0)qw`wWetxmSLWj&r^egQ8%Y70CJ?MCMr< zi&We*sYsP8!<|$YpB7DQ6Ad&AUs86Vm}+2ua-$?DfHX>a>VoP@K!^~&6bd>kbYbLs ztJL&43S|fU3X#wuN#y!Nr*!q>Bt)1BWVv=xqq^0#6R$oLi=ytc+2{TC{$a7Y|L*`w zU5E0Z&;o*NpHiLwaOkc1h}U+8qu35g^wPdc>^N~aIn+ubn;5&F@9swQBAg1#kv@)p zmc79x_*VRxyp(28@;<6i>5yBK)77Kr5IxS6cgzcVWWy?qwp7-FO9`m6R^zp3sL-?w zdUB~22ZQ=Z_3coY-i@GP%3wBI@172e&1P{}?|1LCyKRSKuT9JasBKTGk1jfALYh6G zF;Hk+Z^Y`*3w+aT)fSe31)P{&zv$3^jDs>v^dXD5Kkz?2BQ1ykgl`yMCtdfr_rnLw zj_2!d*>L&%_B7&uD`>0iaFy115i~TqgN&THcdC3=HPYdtE@bEUF4??=G_?FO}wi_`VMSzPfX(OYed^MZ|yAlHXD)qd84C@fvV{d`L3~ z7iHm+)zhXr8d)S-SjhH~HWj>(15+>G6e%}qY_zYE!>Pk0l(f(j+r@f!z`wvqdKDu>{gq``?XN%>D&XO928G0~7!N00;meh!QVWBz`k} w1ONc%2mk;E01cB41sWbJ>OenLcmM!UO9ci1000010096&0002C1ONa40QN^-ssI20 diff --git a/test/test1.zip b/test/test1.zip deleted file mode 100644 index c46015d9431bbeb93e5c7afc5209e67110568e0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1183 zcmaKqy=nqM5P-)!J@p`|5^GTqE5ZM}Du*BvEL89+3qepYq(~J^cY!=ds&p2TH@Fmb zTBpfVh!2oib!BIl-8}{tZojV>zG2@^y1-6%{av>9w|8m0vvJ@a7R%>(r5cX2V2=(3 ze~J^Xl5kAG=~uq$4hjGBS$t6V+LdPx!q+4|+IS^}uj~1`#P|HSrNTG#d_&@$%;StWf|P^ng)DxL_$0sq F_y=Zm;3EJ4 -- 2.40.0