diff -r 008c75a5e08d -r 6a8a57779674 test/Makefile.am
--- a/test/Makefile.am	Mon Jul 04 10:48:18 2016 +0100
+++ b/test/Makefile.am	Fri Jul 08 15:54:49 2016 +0100
@@ -4,38 +4,60 @@
 if HAVE_LUA
   check_SCRIPTS += lua mult-install
 endif
+if HAVE_ZIP
+  check_SCRIPTS += archive
+endif
+if HAVE_CURL
+if !MSWIN_API
+  check_SCRIPTS += curl
+endif
+endif
 check_SCRIPTS += order non-ascii relative-root
 
-relocate:	relocate.sh primary.xml.gz
+if !MSWIN_API
+  check_PROGRAMS = tftpd
+endif
+
+if INSTALL_TEST_PROGRAMS
+  bin_PROGRAMS = $(check_PROGRAMS)
+endif
+
+relocate:	relocate.sh base/repodata/primary.xml.gz
 	cp $(srcdir)/relocate.sh relocate
 
-named-root:	named-root.sh primary.xml.gz
+named-root:	named-root.sh base/repodata/primary.xml.gz
 	cp $(srcdir)/named-root.sh named-root
 
-remove:	remove.sh primary.xml.gz
+remove:	remove.sh base/repodata/primary.xml.gz
 	cp $(srcdir)/remove.sh remove
 
 update:	update.sh base/repodata/primary.xml.gz updates/repodata/primary.xml.gz
 	cp $(srcdir)/update.sh update
 
-details:	details.sh primary.xml.gz
+details:	details.sh base/repodata/primary.xml.gz
 	cp $(srcdir)/details.sh details
 
-order:	order.sh primary.xml.gz
+order:	order.sh base/repodata/primary.xml.gz
 	cp $(srcdir)/order.sh order
 
-non-ascii:	non-ascii.sh primary.xml.gz
+non-ascii:	non-ascii.sh base/repodata/primary.xml.gz
 	cp $(srcdir)/non-ascii.sh non-ascii
 
-relative-root:	relative-root.sh primary.xml.gz
+relative-root:	relative-root.sh base/repodata/primary.xml.gz
 	cp $(srcdir)/relative-root.sh relative-root
 
-lua:	lua.sh primary.xml.gz
+lua:	lua.sh base/repodata/primary.xml.gz
 	cp $(srcdir)/lua.sh lua
 
-mult-install:	mult-install.sh primary.xml.gz
+mult-install:	mult-install.sh base/repodata/primary.xml.gz
 	cp $(srcdir)/mult-install.sh mult-install
 
+archive:	archive.sh base.zip
+	cp $(srcdir)/archive.sh archive
+
+curl:	curl.sh tftpd base/repodata/primary.xml.gz
+	cp $(srcdir)/curl.sh curl
+
 base/repodata/primary.xml.gz:	zsh.spec zsh2.spec zip.spec zap.spec \
 		filesystem.spec Makefile
 	rm -rf rpmbuild base
@@ -52,6 +74,9 @@
 	rm -rf rpmbuild
 	createrepo --simple-md-filenames base
 
+base.zip:	base/repodata/primary.xml.gz
+	(cd base && zip -r ../$@ *)
+
 updates/repodata/primary.xml.gz:	zip.spec Makefile
 	rm -rf rpmbuild updates
 	mkdir -p rpmbuild/BUILD rpmbuild/RPMS
@@ -62,11 +87,6 @@
 	rm -rf rpmbuild
 	createrepo --simple-md-filenames updates
 
-primary.xml.gz:	base/repodata/primary.xml.gz
-	cp base/repodata/primary.xml.gz base/repodata/filelists.xml.gz .
-	rm -rf rpms
-	ln -s base/Packages rpms
-
 TESTS = $(check_SCRIPTS)
 
 EXTRA_DIST = 			\
@@ -79,6 +99,8 @@
 	order.sh		\
 	non-ascii.sh		\
 	relative-root.sh	\
+	archive.sh		\
+	curl.sh			\
 	mult-install.sh		\
 	lua.sh			\
 	remove.sh		\
@@ -89,6 +111,7 @@
 	relocate.sh
 
 MOSTLYCLEANFILES =		\
+	base.zip		\
 	primary.xml.gz		\
 	filelists.xml.gz	\
 	$(check_SCRIPTS)	\
@@ -97,4 +120,4 @@
 
 clean-local :
 	rm -f *~
-	rm -rf repodata rpms base updates
+	rm -rf base updates