1.1 --- a/tests/Makefile.am	Tue Jul 05 12:48:24 2016 +0100
     1.2 +++ b/tests/Makefile.am	Thu Jun 07 15:56:09 2018 +0100
     1.3 @@ -2,7 +2,7 @@
     1.4  
     1.5  EXTRA_DIST = zsh.spec zsh2.spec zip.spec zap.spec filesystem.spec zappy.spec \
     1.6      zappy2.spec unsatisfiable.spec uninstallable.spec badpostun.spec comps.xml \
     1.7 -    glib.supp.in README xvfb-run
     1.8 +    distribution-local-comps.xml glib.supp.in README xvfb-run
     1.9  
    1.10  pkg_V_rpmbuild = $(pkg_v_rpmbuild_$(V))
    1.11  pkg_v_rpmbuild_ = $(pkg_v_rpmbuild_$(AM_DEFAULT_VERBOSITY))
    1.12 @@ -13,7 +13,8 @@
    1.13  if HAVE_CHECK_TOOLS
    1.14  
    1.15  noinst_DATA = glib.supp yum-repo-test-dir/repodata/primary.xml.gz \
    1.16 -	primary.xml.gz razor-test-dir/var/lib/razor/system.rzdb
    1.17 +	distribution-local-test-dir/repodata/primary.xml.gz \
    1.18 +	razor-test-dir/var/lib/razor/system.rzdb
    1.19  
    1.20  if HAVE_VALGRIND_3_9
    1.21  %.supp: %.supp.in
    1.22 @@ -23,6 +24,22 @@
    1.23  	grep -v '^ *match-leak-kinds: ' $< > $@
    1.24  endif
    1.25  
    1.26 +distribution-local-test-dir/repodata/primary.xml.gz: filesystem.spec \
    1.27 +    zappy.spec Makefile
    1.28 +	rm -rf rpmbuild distribution-local-test-dir
    1.29 +	mkdir -p rpmbuild/BUILD rpmbuild/RPMS
    1.30 +	$(BUILD_RPM) $(srcdir)/filesystem.spec
    1.31 +	$(BUILD_RPM) $(srcdir)/zappy.spec
    1.32 +	mkdir -p distribution-local-test-dir/Packages
    1.33 +	mv rpmbuild/RPMS/noarch/*.rpm distribution-local-test-dir/Packages
    1.34 +	rm -rf rpmbuild
    1.35 +	cp $(srcdir)/distribution-local-comps.xml \
    1.36 +	  distribution-local-test-dir/comps.xml
    1.37 +	$(CREATEREPO) --simple-md-filenames -g comps.xml \
    1.38 +	  distribution-local-test-dir
    1.39 +	mv distribution-local-test-dir/comps.xml \
    1.40 +	  distribution-local-test-dir/repodata
    1.41 +
    1.42  yum-repo-test-dir/repodata/primary.xml.gz: zsh.spec zsh2.spec zip.spec \
    1.43      zap.spec filesystem.spec zappy.spec zappy2.spec unsatisfiable.spec \
    1.44      uninstallable.spec badpostun.spec Makefile
    1.45 @@ -45,13 +62,7 @@
    1.46  	$(CREATEREPO) --simple-md-filenames -g comps.xml yum-repo-test-dir
    1.47  	mv yum-repo-test-dir/comps.xml yum-repo-test-dir/repodata
    1.48  
    1.49 -primary.xml.gz: yum-repo-test-dir/repodata/primary.xml.gz
    1.50 -	cp yum-repo-test-dir/repodata/primary.xml.gz \
    1.51 -	  yum-repo-test-dir/repodata/filelists.xml.gz .
    1.52 -	rm -rf rpms
    1.53 -	ln -s yum-repo-test-dir/rpms .
    1.54 -
    1.55 -razor-test-dir/var/lib/razor/system.rzdb: primary.xml.gz
    1.56 +razor-test-dir/var/lib/razor/system.rzdb: yum-repo-test-dir/repodata/primary.xml.gz
    1.57  	$(RM) -r razor-test-dir
    1.58  	$(RAZOR) --root=file:razor-test-dir init
    1.59  	$(RAZOR) --url=file://localhost`pwd`/yum-repo-test-dir \
    1.60 @@ -71,7 +82,7 @@
    1.61  	done
    1.62  
    1.63  clean-local:
    1.64 -	rm -rf yum-repo-test-dir razor-test-dir
    1.65 -	rm -f primary.xml.gz filelists.xml.gz rpms rawhide.rzdb
    1.66 +	rm -rf yum-repo-test-dir distribution-local-test-dir razor-test-dir
    1.67 +	rm -f rawhide.rzdb
    1.68  
    1.69  CLEANFILES = glib.supp