Run tests in %check instead of %build

This commit is contained in:
Mikolaj Izdebski 2013-07-02 07:19:39 +02:00
parent 2f0d532518
commit 86f0e31076

View File

@ -29,6 +29,7 @@
# #
%bcond_with bootstrap %bcond_with bootstrap
%bcond_without tests
%if %with bootstrap %if %with bootstrap
%global build_javadoc 0 %global build_javadoc 0
@ -389,7 +390,7 @@ mv LICENSE.utf8 LICENSE
%build %build
%if %without bootstrap %if %without bootstrap
%{ant} jars test-jar test %{ant} jars test-jar
%if %{build_javadoc} %if %{build_javadoc}
export CLASSPATH=$(build-classpath xerces-j2 antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) export CLASSPATH=$(build-classpath xerces-j2 antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
%{ant} javadocs %{ant} javadocs
@ -511,6 +512,11 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
| xargs -t rm | xargs -t rm
%endif %endif
%if %with tests
%check
%{ant} test
%endif
%files %files
%doc KEYS LICENSE NOTICE README WHATSNEW %doc KEYS LICENSE NOTICE README WHATSNEW
%config(noreplace) %{_sysconfdir}/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}.conf
@ -682,6 +688,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
- Remove bcond macro definitions (provided by rpm itself) - Remove bcond macro definitions (provided by rpm itself)
- Remove Group tags - Remove Group tags
- Update to current packaging guidelines - Update to current packaging guidelines
- Run tests in %%check instead of %%build
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.9.1-2 * Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.9.1-2
- Enable unit tests - Enable unit tests