1.1 --- a/test/Makefile.am	Mon Jul 04 10:48:18 2016 +0100
     1.2 +++ b/test/Makefile.am	Fri Jul 08 17:12:36 2016 +0100
     1.3 @@ -4,38 +4,60 @@
     1.4  if HAVE_LUA
     1.5    check_SCRIPTS += lua mult-install
     1.6  endif
     1.7 +if HAVE_ZIP
     1.8 +  check_SCRIPTS += archive
     1.9 +endif
    1.10 +if HAVE_CURL
    1.11 +if !MSWIN_API
    1.12 +  check_SCRIPTS += curl
    1.13 +endif
    1.14 +endif
    1.15  check_SCRIPTS += order non-ascii relative-root
    1.16  
    1.17 -relocate:	relocate.sh primary.xml.gz
    1.18 +if !MSWIN_API
    1.19 +  check_PROGRAMS = tftpd
    1.20 +endif
    1.21 +
    1.22 +if INSTALL_TEST_PROGRAMS
    1.23 +  bin_PROGRAMS = $(check_PROGRAMS)
    1.24 +endif
    1.25 +
    1.26 +relocate:	relocate.sh base/repodata/primary.xml.gz
    1.27  	cp $(srcdir)/relocate.sh relocate
    1.28  
    1.29 -named-root:	named-root.sh primary.xml.gz
    1.30 +named-root:	named-root.sh base/repodata/primary.xml.gz
    1.31  	cp $(srcdir)/named-root.sh named-root
    1.32  
    1.33 -remove:	remove.sh primary.xml.gz
    1.34 +remove:	remove.sh base/repodata/primary.xml.gz
    1.35  	cp $(srcdir)/remove.sh remove
    1.36  
    1.37  update:	update.sh base/repodata/primary.xml.gz updates/repodata/primary.xml.gz
    1.38  	cp $(srcdir)/update.sh update
    1.39  
    1.40 -details:	details.sh primary.xml.gz
    1.41 +details:	details.sh base/repodata/primary.xml.gz
    1.42  	cp $(srcdir)/details.sh details
    1.43  
    1.44 -order:	order.sh primary.xml.gz
    1.45 +order:	order.sh base/repodata/primary.xml.gz
    1.46  	cp $(srcdir)/order.sh order
    1.47  
    1.48 -non-ascii:	non-ascii.sh primary.xml.gz
    1.49 +non-ascii:	non-ascii.sh base/repodata/primary.xml.gz
    1.50  	cp $(srcdir)/non-ascii.sh non-ascii
    1.51  
    1.52 -relative-root:	relative-root.sh primary.xml.gz
    1.53 +relative-root:	relative-root.sh base/repodata/primary.xml.gz
    1.54  	cp $(srcdir)/relative-root.sh relative-root
    1.55  
    1.56 -lua:	lua.sh primary.xml.gz
    1.57 +lua:	lua.sh base/repodata/primary.xml.gz
    1.58  	cp $(srcdir)/lua.sh lua
    1.59  
    1.60 -mult-install:	mult-install.sh primary.xml.gz
    1.61 +mult-install:	mult-install.sh base/repodata/primary.xml.gz
    1.62  	cp $(srcdir)/mult-install.sh mult-install
    1.63  
    1.64 +archive:	archive.sh base.zip
    1.65 +	cp $(srcdir)/archive.sh archive
    1.66 +
    1.67 +curl:	curl.sh tftpd base/repodata/primary.xml.gz
    1.68 +	cp $(srcdir)/curl.sh curl
    1.69 +
    1.70  base/repodata/primary.xml.gz:	zsh.spec zsh2.spec zip.spec zap.spec \
    1.71  		filesystem.spec Makefile
    1.72  	rm -rf rpmbuild base
    1.73 @@ -52,6 +74,9 @@
    1.74  	rm -rf rpmbuild
    1.75  	createrepo --simple-md-filenames base
    1.76  
    1.77 +base.zip:	base/repodata/primary.xml.gz
    1.78 +	(cd base && zip -r ../$@ *)
    1.79 +
    1.80  updates/repodata/primary.xml.gz:	zip.spec Makefile
    1.81  	rm -rf rpmbuild updates
    1.82  	mkdir -p rpmbuild/BUILD rpmbuild/RPMS
    1.83 @@ -62,11 +87,6 @@
    1.84  	rm -rf rpmbuild
    1.85  	createrepo --simple-md-filenames updates
    1.86  
    1.87 -primary.xml.gz:	base/repodata/primary.xml.gz
    1.88 -	cp base/repodata/primary.xml.gz base/repodata/filelists.xml.gz .
    1.89 -	rm -rf rpms
    1.90 -	ln -s base/Packages rpms
    1.91 -
    1.92  TESTS = $(check_SCRIPTS)
    1.93  
    1.94  EXTRA_DIST = 			\
    1.95 @@ -79,6 +99,8 @@
    1.96  	order.sh		\
    1.97  	non-ascii.sh		\
    1.98  	relative-root.sh	\
    1.99 +	archive.sh		\
   1.100 +	curl.sh			\
   1.101  	mult-install.sh		\
   1.102  	lua.sh			\
   1.103  	remove.sh		\
   1.104 @@ -89,6 +111,7 @@
   1.105  	relocate.sh
   1.106  
   1.107  MOSTLYCLEANFILES =		\
   1.108 +	base.zip		\
   1.109  	primary.xml.gz		\
   1.110  	filelists.xml.gz	\
   1.111  	$(check_SCRIPTS)	\
   1.112 @@ -97,4 +120,4 @@
   1.113  
   1.114  clean-local :
   1.115  	rm -f *~
   1.116 -	rm -rf repodata rpms base updates
   1.117 +	rm -rf base updates