svn commit: r1058987 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

[st...@apache.org]

Author: stsp
Date: Fri Jan 14 12:53:59 2011
New Revision: 1058987

URL: http://svn.apache.org/viewvc?rev=1058987&view=rev
Log:
* tools/dev/unix-build/Makefile.svn
  (SVNSERVE_STOP_CMD): Remove pid file after killing svnserve.
  (SVNSERVE_START_CMD): Kill any svnserve processes listed in possibly
    stale pidfiles and remove the pidfiles before starting a new deamon.

This is an attempt to prevent errors due to rogue svnserve processes
left over from an interrupted test run. See the end of
http://ci.apache.org/builders/svn-openbsd-i386/builds/105/steps/Test/logs/stdio

Modified:
    subversion/trunk/tools/dev/unix-build/Makefile.svn

Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1058987&r1=1058986&r2=1058987&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Fri Jan 14 12:53:59 2011
@@ -1050,7 +1050,8 @@ SVNSERVE_START_CMD = $(SVN_PREFIX)/bin/s
 			--listen-host 127.0.0.1 \
 			--pid-file $(PWD)/svnserve-$(WC).pid \
 			-d -r $(svn_builddir)/subversion/tests/cmdline
-SVNSERVE_STOP_CMD = kill `cat $(PWD)/svnserve-$(WC).pid`
+SVNSERVE_STOP_CMD = kill `cat $(PWD)/svnserve-$(WC).pid`; sleep 3; \
+			rm -f $(PWD)/svnserve-$(WC).pid
 
 start-httpd: httpd-conf
 	$(HTTPD_START_CMD)
@@ -1063,6 +1064,10 @@ stop-httpd:
 	$(HTTPD_STOP_CMD)
 
 start-svnserve: $(SVN_OBJDIR)/.compiled
+	-ls $(PWD)/svnserve-*.pid | while read pidfile; do \
+		kill `cat "$$pidfile"`; sleep 3; \
+		rm -f $$pidfile; \
+	done
 	$(SVNSERVE_START_CMD)
 
 stop-svnserve: