[prev in list] [next in list] [prev in thread] [next in thread]
List: subversion-cvs
Subject: svn commit: r14536 - in trunk/packages/rpm: redhat-7.x rhel-4
From: david () tigris ! org
Date: 2005-04-30 20:29:50
Message-ID: 200504302029.j3UKTo015703 () morbius ! ch ! collab ! net
[Download RAW message or body]
Author: david
Date: Sat Apr 30 15:29:48 2005
New Revision: 14536
Modified:
trunk/packages/rpm/redhat-7.x/subversion.spec
trunk/packages/rpm/redhat-8+/subversion.spec
trunk/packages/rpm/rhel-4/subversion.spec
Log:
* rpm/redhat-7.x/subversion.spec,
rpm/redhat-8+/subversion.spec,
rpm/rhel-4/subversion.spec : Make backend regression tests explicit and make
sure we do them for both BDB and FSFS backends.
Modified: trunk/packages/rpm/redhat-7.x/subversion.spec
Url: http://svn.collab.net/viewcvs/svn/trunk/packages/rpm/redhat-7.x/subversion.spec?r \
ev=14536&p1=trunk/packages/rpm/redhat-7.x/subversion.spec&p2=trunk/packages/rpm/redhat-7.x/subversion.spec&r1=14535&r2=14536
==============================================================================
--- trunk/packages/rpm/redhat-7.x/subversion.spec (original)
+++ trunk/packages/rpm/redhat-7.x/subversion.spec Sat Apr 30 15:29:48 2005
@@ -3,9 +3,12 @@
%define swig_version 1.3.19-3
%define apache_dir /usr/local/apache2
# If you don't want to take time for the tests then set make_*_check to 0.
-%define make_ra_local_check 1
-%define make_ra_svn_check 1
-%define make_ra_dav_check 1
+%define make_ra_local_bdb_check 1
+%define make_ra_svn_bdb_check 1
+%define make_ra_dav_bdb_check 1
+%define make_ra_local_fsfs_check 1
+%define make_ra_svn_fsfs_check 1
+%define make_ra_dav_fsfs_check 1
# If you want the perl bindings, you'll have to install perl-5.8.0 or higher.
%define perl_bindings 0
Summary: A Concurrent Versioning system similar to but better than CVS.
@@ -104,6 +107,10 @@
Tools for Subversion.
%changelog
+* Sat Apr 30 2005 David Summers <david@summersoft.fay.ar.us> r14530
+- Make backend regression tests explicit and make sure we do them for both BDB
+ and FSFS backends.
+
* Thu Mar 31 2005 David Summers <david@summersoft.fay.ar.us> r13821
- Greatly reduce disk usage by telling each test pass to cleanup after
successful tests.
@@ -423,23 +430,56 @@
)
%endif
-%if %{make_ra_local_check}
+%if %{make_ra_local_bdb_check}
+echo "*** Running regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
+make check CLEANUP=true FS_TYPE=bdb
+echo "*** Finished regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
+%endif
+
+%if %{make_ra_svn_bdb_check}
+echo "*** Running regression tests on RA_SVN (SVN method) layer ***"
+killall lt-svnserve || true
+sleep 1
+./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/clients/cmdline/
+make svncheck CLEANUP=true FS_TYPE=bdb
+killall lt-svnserve
+echo "*** Finished regression tests on RA_SVN (SVN method) layer ***"
+%endif
+
+%if %{make_ra_dav_bdb_check}
+echo "*** Running regression tests on RA_DAV (HTTP method) layer ***"
+killall httpd || true
+sleep 1
+cp -f /usr/local/apache2/bin/httpd .
+sed -e "s;@SVNDIR@;`pwd`;" < packages/rpm/redhat-7.x/httpd.davcheck.conf > \
httpd.conf +cat > passwd <<EOF
+jrandom:xCGl35kV9oWCY
+jconstant:xCGl35kV9oWCY
+EOF
+./httpd -f `pwd`/httpd.conf
+sleep 1
+make check CLEANUP=true BASE_URL='http://localhost:15835' FS_TYPE=bdb
+killall httpd
+echo "*** Finished regression tests on RA_DAV (HTTP method) layer ***"
+%endif
+
+%if %{make_ra_local_fsfs_check}
echo "*** Running regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
-make check CLEANUP=true
+make check CLEANUP=true FS_TYPE=fsfs
echo "*** Finished regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
%endif
-%if %{make_ra_svn_check}
+%if %{make_ra_svn_fsfs_check}
echo "*** Running regression tests on RA_SVN (SVN method) layer ***"
killall lt-svnserve || true
sleep 1
./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/clients/cmdline/
-make svncheck CLEANUP=true
+make svncheck CLEANUP=true FS_TYPE=fsfs
killall lt-svnserve
echo "*** Finished regression tests on RA_SVN (SVN method) layer ***"
%endif
-%if %{make_ra_dav_check}
+%if %{make_ra_dav_fsfs_check}
echo "*** Running regression tests on RA_DAV (HTTP method) layer ***"
killall httpd || true
sleep 1
@@ -451,7 +491,7 @@
EOF
./httpd -f `pwd`/httpd.conf
sleep 1
-make check CLEANUP=true BASE_URL='http://localhost:15835'
+make check CLEANUP=true BASE_URL='http://localhost:15835' FS_TYPE=fsfs
killall httpd
echo "*** Finished regression tests on RA_DAV (HTTP method) layer ***"
%endif
Modified: trunk/packages/rpm/redhat-8+/subversion.spec
Url: http://svn.collab.net/viewcvs/svn/trunk/packages/rpm/redhat-8%2B/subversion.spec? \
rev=14536&p1=trunk/packages/rpm/redhat-8%2B/subversion.spec&p2=trunk/packages/rpm/redhat-8%2B/subversion.spec&r1=14535&r2=14536
==============================================================================
--- trunk/packages/rpm/redhat-8+/subversion.spec (original)
+++ trunk/packages/rpm/redhat-8+/subversion.spec Sat Apr 30 15:29:48 2005
@@ -4,9 +4,12 @@
%define swig_version 1.3.19-3
%define apache_dir /usr
# If you don't want to take time for the tests then set make_*_check to 0.
-%define make_ra_local_check 1
-%define make_ra_svn_check 1
-%define make_ra_dav_check 1
+%define make_ra_local_bdb_check 1
+%define make_ra_svn_bdb_check 1
+%define make_ra_dav_bdb_check 1
+%define make_ra_local_fsfs_check 1
+%define make_ra_svn_fsfs_check 1
+%define make_ra_dav_fsfs_check 1
Summary: A Concurrent Versioning system similar to but better than CVS.
Name: subversion
Version: @VERSION@
@@ -100,6 +103,10 @@
Tools for Subversion.
%changelog
+* Sat Apr 30 2005 David Summers <david@summersoft.fay.ar.us> r14530
+- Make backend regression tests explicit and make sure we do them for both BDB
+ and FSFS backends.
+
* Thu Mar 31 2005 David Summers <david@summersoft.fay.ar.us> r13821
- Greatly reduce disk usage by telling each test pass to cleanup after
successful tests.
@@ -420,23 +427,23 @@
(make test)
cd ../../../../..
-%if %{make_ra_local_check}
+%if %{make_ra_local_bdb_check}
echo "*** Running regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
-make check CLEANUP=true
+make check CLEANUP=true FS_TYPE=bdb
echo "*** Finished regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
%endif
-%if %{make_ra_svn_check}
+%if %{make_ra_svn_bdb_check}
echo "*** Running regression tests on RA_SVN (SVN method) layer ***"
killall lt-svnserve || true
sleep 1
./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/clients/cmdline/
-make svncheck CLEANUP=true
+make svncheck CLEANUP=true FS_TYPE=bdb
killall lt-svnserve
echo "*** Finished regression tests on RA_SVN (SVN method) layer ***"
%endif
-%if %{make_ra_dav_check}
+%if %{make_ra_dav_bdb_check}
echo "*** Running regression tests on RA_DAV (HTTP method) layer ***"
killall httpd || true
sleep 1
@@ -447,7 +454,39 @@
EOF
/usr/sbin/httpd -f `pwd`/httpd.conf
sleep 1
-make check CLEANUP=true BASE_URL='http://localhost:15835'
+make check CLEANUP=true BASE_URL='http://localhost:15835' FS_TYPE=bdb
+killall httpd
+echo "*** Finished regression tests on RA_DAV (HTTP method) layer ***"
+%endif
+
+%if %{make_ra_local_fsfs_check}
+echo "*** Running regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
+make check CLEANUP=true FS_TYPE=fsfs
+echo "*** Finished regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
+%endif
+
+%if %{make_ra_svn_fsfs_check}
+echo "*** Running regression tests on RA_SVN (SVN method) layer ***"
+killall lt-svnserve || true
+sleep 1
+./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/clients/cmdline/
+make svncheck CLEANUP=true FS_TYPE=fsfs
+killall lt-svnserve
+echo "*** Finished regression tests on RA_SVN (SVN method) layer ***"
+%endif
+
+%if %{make_ra_dav_fsfs_check}
+echo "*** Running regression tests on RA_DAV (HTTP method) layer ***"
+killall httpd || true
+sleep 1
+sed -e "s;@SVNDIR@;`pwd`;" < packages/rpm/redhat-8+/httpd.davcheck.conf > httpd.conf
+cat > passwd <<EOF
+jrandom:xCGl35kV9oWCY
+jconstant:xCGl35kV9oWCY
+EOF
+/usr/sbin/httpd -f `pwd`/httpd.conf
+sleep 1
+make check CLEANUP=true BASE_URL='http://localhost:15835' FS_TYPE=fsfs
killall httpd
echo "*** Finished regression tests on RA_DAV (HTTP method) layer ***"
%endif
Modified: trunk/packages/rpm/rhel-4/subversion.spec
Url: http://svn.collab.net/viewcvs/svn/trunk/packages/rpm/rhel-4/subversion.spec?rev=1 \
4536&p1=trunk/packages/rpm/rhel-4/subversion.spec&p2=trunk/packages/rpm/rhel-4/subversion.spec&r1=14535&r2=14536
==============================================================================
--- trunk/packages/rpm/rhel-4/subversion.spec (original)
+++ trunk/packages/rpm/rhel-4/subversion.spec Sat Apr 30 15:29:48 2005
@@ -4,9 +4,12 @@
%define swig_version 1.3.21
%define apache_dir /usr
# If you don't want to take time for the tests then set make_*_check to 0.
-%define make_ra_local_check 1
-%define make_ra_svn_check 1
-%define make_ra_dav_check 1
+%define make_ra_local_bdb_check 1
+%define make_ra_svn_bdb_check 1
+%define make_ra_dav_bdb_check 1
+%define make_ra_local_fsfs_check 1
+%define make_ra_svn_fsfs_check 1
+%define make_ra_dav_fsfs_check 1
Summary: A Concurrent Versioning system similar to but better than CVS.
Name: subversion
Version: @VERSION@
@@ -102,6 +105,10 @@
Tools for Subversion.
%changelog
+* Sat Apr 30 2005 David Summers <david@summersoft.fay.ar.us> r14530
+- Make backend regression tests explicit and make sure we do them for both BDB
+ and FSFS backends.
+
* Sun Apr 24 2005 David Summers <david@summersoft.fay.ar.us> r14429
- Add build for RHEL4 for both BDB and FSFS back-ends.
@@ -419,23 +426,55 @@
make test
cd ../../../../..
-%if %{make_ra_local_check}
+%if %{make_ra_local_bdb_check}
+echo "*** Running regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
+make check CLEANUP=true FS_TYPE=bdb
+echo "*** Finished regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
+%endif
+
+%if %{make_ra_svn_bdb_check}
+echo "*** Running regression tests on RA_SVN (SVN method) layer ***"
+killall lt-svnserve || true
+sleep 1
+./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/clients/cmdline/
+make svncheck CLEANUP=true FS_TYPE=bdb
+killall lt-svnserve
+echo "*** Finished regression tests on RA_SVN (SVN method) layer ***"
+%endif
+
+%if %{make_ra_dav_bdb_check}
+echo "*** Running regression tests on RA_DAV (HTTP method) layer ***"
+killall httpd || true
+sleep 1
+sed -e "s;@SVNDIR@;`pwd`;" < packages/rpm/rhel-4/httpd.davcheck.conf > httpd.conf
+cat > passwd <<EOF
+jrandom:xCGl35kV9oWCY
+jconstant:xCGl35kV9oWCY
+EOF
+/usr/sbin/httpd -f `pwd`/httpd.conf
+sleep 1
+make check CLEANUP=true BASE_URL='http://localhost:15835' FS_TYPE=bdb
+killall httpd
+echo "*** Finished regression tests on RA_DAV (HTTP method) layer ***"
+%endif
+
+%if %{make_ra_local_fsfs_check}
echo "*** Running regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
-make check CLEANUP=true
+make check CLEANUP=true FS_TYPE=fsfs
echo "*** Finished regression tests on RA_LOCAL (FILE SYSTEM) layer ***"
%endif
-%if %{make_ra_svn_check}
+%if %{make_ra_svn_fsfs_check}
echo "*** Running regression tests on RA_SVN (SVN method) layer ***"
killall lt-svnserve || true
sleep 1
./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/clients/cmdline/
-make svncheck CLEANUP=true
+make svncheck CLEANUP=true FS_TYPE=fsfs
killall lt-svnserve
echo "*** Finished regression tests on RA_SVN (SVN method) layer ***"
%endif
-%if %{make_ra_dav_check}
+%if %{make_ra_dav_fsfs_check}
echo "*** Running regression tests on RA_DAV (HTTP method) layer ***"
killall httpd || true
sleep 1
@@ -446,7 +485,7 @@
EOF
/usr/sbin/httpd -f `pwd`/httpd.conf
sleep 1
-make check CLEANUP=true BASE_URL='http://localhost:15835'
+make check CLEANUP=true BASE_URL='http://localhost:15835' FS_TYPE=fsfs
killall httpd
echo "*** Finished regression tests on RA_DAV (HTTP method) layer ***"
%endif
---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic