remake test0.zip and push to shipped test/test.zip #20

diff --git a/test/Makefile.am b/test/Makefile.am
index f493b07b60f49a50cfcbefa524bcb5142770ea26..fc4ae2ed279f439ae5da2f059023623765275054 100644 (file)
--- 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 5c0f42cf78472fcd8a20305a4306e755c9760c54..984db8eb1bf10ca1b8931a3d91ac36d65091e4c2 100644 (file)
--- 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 (file)
Binary files a/test/test.zip and b/test/test.zip differ

diff --git a/test/test1.zip b/test/test1.zip
deleted file mode 100644 (file)
index c46015d..0000000
Binary files a/test/test1.zip and /dev/null differ