packages: git-core/git-core.spec - disable cvs tests by default

arekm arekm at pld-linux.org
Sun Oct 11 18:31:07 CEST 2009


Author: arekm                        Date: Sun Oct 11 16:31:07 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable cvs tests by default

---- Files affected:
packages/git-core:
   git-core.spec (1.172 -> 1.173) 

---- Diffs:

================================================================
Index: packages/git-core/git-core.spec
diff -u packages/git-core/git-core.spec:1.172 packages/git-core/git-core.spec:1.173
--- packages/git-core/git-core.spec:1.172	Sun Oct 11 17:09:14 2009
+++ packages/git-core/git-core.spec	Sun Oct 11 18:31:02 2009
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_without	tests	# don't perform make test
+%bcond_with		tests_cvs
 %bcond_without	doc	# skip building/packaging docs/manuals (takes some time)
 #
 %include	/usr/lib/rpm/macros.perl
@@ -38,9 +39,11 @@
 BuildRequires:	xmlto
 %endif
 %if %{with tests}
+%if %{with tests_cvs}
 # tests failed sometimes when using nserver/cvsnt client so enforce pure cvs here
 BuildRequires:	cvs-gnu-client < 1.13
 BuildRequires:	cvs-gnu-client >= 1.12
+%endif
 BuildRequires:	pdksh >= 5.2.14-46
 %endif
 Requires:	coreutils
@@ -319,7 +322,12 @@
 
 %{?with_doc:%{__make} -C Documentation}
 
-%{?with_tests:%{__make} test}
+%if %{with tests}
+%if %{without tests_cvs}
+rm t/t*cvs*.sh
+%endif
+%{__make} test
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -554,6 +562,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.173  2009/10/11 16:31:02  arekm
+- disable cvs tests by default
+
 Revision 1.172  2009/10/11 15:09:14  arekm
 - up to 1.6.5; use Linus sha1 implementation
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/git-core/git-core.spec?r1=1.172&r2=1.173&f=u



More information about the pld-cvs-commit mailing list