You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2018/02/11 04:00:18 UTC

svn commit: r1823810 - in /subversion/branches/1.10.x: ./ STATUS subversion/tests/cmdline/davautocheck.sh

Author: svn-role
Date: Sun Feb 11 04:00:18 2018
New Revision: 1823810

URL: http://svn.apache.org/viewvc?rev=1823810&view=rev
Log:
Merge r1820627 from trunk:

 * r1820627
   davautocheck.sh: Support a --lldb option alongside --gdb.
   Justification:
     Will be helpful in debugging backports.
   Votes:
     +1: danielsh, brane, stsp

Modified:
    subversion/branches/1.10.x/   (props changed)
    subversion/branches/1.10.x/STATUS
    subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh

Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 11 04:00:18 2018
@@ -100,4 +100,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822996,1823202-1823203,1823327
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822996,1823202-1823203,1823327

Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1823810&r1=1823809&r2=1823810&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sun Feb 11 04:00:18 2018
@@ -20,10 +20,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1820627
-   davautocheck.sh: Support a --lldb option alongside --gdb.
-   Justification:
-     Will be helpful in debugging backports.
-   Votes:
-     +1: danielsh, brane, stsp

Modified: subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh?rev=1823810&r1=1823809&r2=1823810&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh Sun Feb 11 04:00:18 2018
@@ -79,8 +79,8 @@
 # environment.
 #
 # Passing --no-tests as argv[1] will have the script start a server
-# but not run any tests.  Passing --gdb will do the same, and in addition
-# spawn gdb in the foreground attached to the running server.
+# but not run any tests.  Passing --gdb or --lldb will do the same, and in
+# addition spawn gdb/lldb in the foreground attached to the running server.
 
 PYTHON=${PYTHON:-python}
 
@@ -763,6 +763,12 @@ if [ $# -eq 1 ] && [ "x$1" = 'x--no-test
   exit
 fi
 
+if [ $# -eq 1 ] && [ "x$1" = 'x--lldb' ]; then
+  echo "http://localhost:$HTTPD_PORT/svn-test-work/repositories"
+  $STOPSCRIPT && lldb --one-line=run -- $START -X
+  exit
+fi
+
 if [ $# -eq 1 ] && [ "x$1" = 'x--gdb' ]; then
   echo "http://localhost:$HTTPD_PORT/svn-test-work/repositories"
   $STOPSCRIPT && gdb -silent -ex r -args $START -X