Commit f4b63bd0 authored by Alejandro Alvarez Ayllon's avatar Alejandro Alvarez Ayllon
Browse files

Allow to set the output dir of nosetests.xml

parent 3c1aec20
......@@ -46,10 +46,10 @@ override_release: $(SPEC)
$(if $(RELEASE), sed -i "s/Release:.*/Release: $(RELEASE)%{?dist}/g" "$(SPEC)")
srpm: dist $(SPEC) $(RPMBUILD) override_release
/usr/bin/rpmbuild --nodeps -bs $(RPMDEFINES_SRC) $(SPEC)
/usr/bin/rpmbuild --nodeps -bs $(RPMDEFINES_SRC) $(RPMBUILD_SRC_FLAGS) $(SPEC)
rpm: srpm
/usr/bin/rpmbuild --rebuild $(RPMDEFINES_BIN) $(NAME)-$(VERSION)-*.src.rpm
/usr/bin/rpmbuild --rebuild $(RPMDEFINES_BIN) $(RPMBUILD_FLAGS) $(NAME)-$(VERSION)-*.src.rpm
mock: srpm
/usr/bin/mock $(MOCK_FLAGS) -r $(MOCK_CHROOT) $(NAME)-$(VERSION)-*.src.rpm
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")}
%{!?nosetest_path: %global nosetest_path "/tmp"}
Name: fts-rest
Version: 3.4.0
Release: 1%{?dist}
......@@ -158,11 +160,11 @@ make %{?_smp_mflags}
pushd src/fts3rest
%if %{?rhel}%{!?rhel:0} == 6
PYTHONPATH=../:/usr/lib64/python2.6/site-packages/SQLAlchemy-0.8.2-py2.6-linux-x86_64.egg/ \
nosetests1.1 --with-xunit --xunit-file=nosetests.xml
nosetests1.1 --with-xunit --xunit-file=%{?nosetest_path}/nosetests.xml
%endif
%if %{?rhel}%{!?rhel:0} >= 7
PYTHONPATH=../ ./setup_pylons_plugin.py install --user
PYTHONPATH=../ nosetests --with-xunit --xunit-file=nosetests.xml
PYTHONPATH=../ nosetests --with-xunit --xunit-file=%{?nosetest_path}/nosetests.xml
%endif
popd
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment