Author: danielsh
Date: Wed Jul 31 15:06:15 2013
New Revision: 1508901
URL: http://svn.apache.org/r1508901
Log:
* subversion/tests/cmdline/davautocheck.sh:
Fix invocation of "kill -9" with no pid argument, when the pid file does
not exist.
Modified:
subversion/trunk/subversion/tests/cmdline/davautocheck.sh
Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1508901&r1=1508900&r2=1508901&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Wed Jul 31
15:06:15 2013
@@ -513,12 +513,12 @@ if [ -d "%s" ]; then
if %s -k stop; then
# httpd had no output; echo a newline.
echo ""
- else
+ elif [ -s "%s" ]; then
# httpd would have printed an error terminated by a newline.
- kill -9 `cat %s`
+ kill -9 "`cat %s`"
fi
fi
-' >$STOPSCRIPT "$HTTPD_ROOT" "$START" "$HTTPD_PID"
+' >$STOPSCRIPT "$HTTPD_ROOT" "$START" "$HTTPD_PID" "$HTTPD_PID"
chmod +x $STOPSCRIPT
$START -t \
