You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by da...@apache.org on 2013/07/31 13:02:47 UTC

svn commit: r1508809 - /subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Author: danielsh
Date: Wed Jul 31 11:02:47 2013
New Revision: 1508809

URL: http://svn.apache.org/r1508809
Log:
* subversion/tests/cmdline/davautocheck.sh:
    Make sure there is always a newline after the "Stopping previous HTTPD
    instances" message.

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=1508809&r1=1508808&r2=1508809&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Wed Jul 31 11:02:47 2013
@@ -510,7 +510,13 @@ printf \
 '#!/bin/sh
 if [ -d "%s" ]; then
   printf "Stopping previous HTTPD instance..."
-  %s -k stop || kill -9 `cat %s`
+  if %s -k stop; then
+    # httpd had no output; echo a newline.
+    echo ""
+  else
+    # httpd would have printed an error terminated by a newline.
+    kill -9 `cat %s`
+  fi
 fi
 ' >$STOPSCRIPT "$HTTPD_ROOT" "$START" "$HTTPD_PID"
 chmod +x $STOPSCRIPT