1.1 --- a/tests/Makefile.am	Tue Jun 28 19:05:38 2016 +0100
     1.2 +++ b/tests/Makefile.am	Tue Jul 05 13:02:45 2016 +0100
     1.3 @@ -38,14 +38,12 @@
     1.4  	$(BUILD_RPM) $(srcdir)/unsatisfiable.spec
     1.5  	$(BUILD_RPM) $(srcdir)/uninstallable.spec
     1.6  	$(BUILD_RPM) $(srcdir)/badpostun.spec
     1.7 -	mkdir -p yum-repo-test-dir/rpms
     1.8 -	mv rpmbuild/RPMS/noarch/*.rpm yum-repo-test-dir/rpms
     1.9 +	mkdir -p yum-repo-test-dir/Packages
    1.10 +	mv rpmbuild/RPMS/noarch/*.rpm yum-repo-test-dir/Packages
    1.11  	rm -rf rpmbuild
    1.12 -	cp $(srcdir)/comps.xml yum-repo-test-dir/rpms
    1.13 -	$(CREATEREPO) --simple-md-filenames -g comps.xml -o yum-repo-test-dir \
    1.14 -	  yum-repo-test-dir/rpms
    1.15 -	$(RM) yum-repo-test-dir/rpms/comps.xml
    1.16 -	cp $(srcdir)/comps.xml yum-repo-test-dir/repodata
    1.17 +	cp $(srcdir)/comps.xml yum-repo-test-dir
    1.18 +	$(CREATEREPO) --simple-md-filenames -g comps.xml yum-repo-test-dir
    1.19 +	mv yum-repo-test-dir/comps.xml yum-repo-test-dir/repodata
    1.20  
    1.21  primary.xml.gz: yum-repo-test-dir/repodata/primary.xml.gz
    1.22  	cp yum-repo-test-dir/repodata/primary.xml.gz \
    1.23 @@ -56,9 +54,10 @@
    1.24  razor-test-dir/var/lib/razor/system.rzdb: primary.xml.gz
    1.25  	$(RM) -r razor-test-dir
    1.26  	$(RAZOR) --root=file:razor-test-dir init
    1.27 -	$(RAZOR) --root=file:razor-test-dir \
    1.28 -	  --url=file://localhost/`pwd`/yum-repo-test-dir import-yum
    1.29 -	$(RAZOR) --root=file:razor-test-dir install zap zappy zappy2 zappy-tools
    1.30 +	$(RAZOR) --url=file://localhost`pwd`/yum-repo-test-dir \
    1.31 +	  --root=file:razor-test-dir import-yum
    1.32 +	$(RAZOR) --url=file://localhost`pwd`/yum-repo-test-dir \
    1.33 +	  --root=file:razor-test-dir install zap zappy zappy2 zappy-tools
    1.34  
    1.35  endif
    1.36