Author: svn-role
Date: Wed Feb 14 04:00:06 2018
New Revision: 1824194

URL: http://svn.apache.org/viewvc?rev=1824194&view=rev
Log:
Merge the r1822587 group from trunk:

 * r1822587, r1822591
   Make it possible to run 'make check' with installed binaries.
   Justification:
     Cuts 'make check' run time in half for me because invoking the
     libtool wrapper shell scripts is slow (at least on OpenBSD).
   Votes:
     +1: stsp, danielsh, philip

Modified:
    subversion/branches/1.10.x/   (props changed)
    subversion/branches/1.10.x/Makefile.in
    subversion/branches/1.10.x/STATUS
    subversion/branches/1.10.x/build/run_tests.py
    subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py

Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 14 04:00:06 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,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822996,1823202-1823203,1823327,1823966,1823989
+/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,1822587,1822591,1822996,1823202-1823203,1823327,1823966,1823989

Modified: subversion/branches/1.10.x/Makefile.in
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/Makefile.in?rev=1824194&r1=1824193&r2=1824194&view=diff
==============================================================================
--- subversion/branches/1.10.x/Makefile.in (original)
+++ subversion/branches/1.10.x/Makefile.in Wed Feb 14 04:00:06 2018
@@ -601,6 +601,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
          if test "$(FSFS_DIR_DELTIFICATION)" != ""; then                    \
            flags="--fsfs-dir-deltification $(FSFS_DIR_DELTIFICATION) $$flags";\
          fi;                                                                \
+         if test "$(SVN_BIN_DIR)" != ""; then                               \
+           flags="--bin $(SVN_BIN_DIR) $$flags";                            \
+         fi;                                                                \
          LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)'           \
          $(PYTHON) $(top_srcdir)/build/run_tests.py                         \
                    --config-file $(top_srcdir)/subversion/tests/tests.conf  \

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1824194&r1=1824193&r2=1824194&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Wed Feb 14 04:00:06 2018
@@ -42,11 +42,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1822587, r1822591
-   Make it possible to run 'make check' with installed binaries.
-   Justification:
-     Cuts 'make check' run time in half for me because invoking the
-     libtool wrapper shell scripts is slow (at least on OpenBSD).
-   Votes:
-     +1: stsp, danielsh, philip

Modified: subversion/branches/1.10.x/build/run_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/build/run_tests.py?rev=1824194&r1=1824193&r2=1824194&view=diff
==============================================================================
--- subversion/branches/1.10.x/build/run_tests.py (original)
+++ subversion/branches/1.10.x/build/run_tests.py Wed Feb 14 04:00:06 2018
@@ -24,7 +24,7 @@
 #
 
 '''usage: python run_tests.py
-            [--verbose] [--log-to-stdout] [--cleanup]
+            [--verbose] [--log-to-stdout] [--cleanup] [--bin=<path>]
             [--parallel | --parallel=<n>] [--global-scheduler]
             [--url=<base-url>] [--http-library=<http-library>] [--enable-sasl]
             [--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]

Modified: subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py?rev=1824194&r1=1824193&r2=1824194&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py 
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py Wed Feb 
14 04:00:06 2018
@@ -1748,6 +1748,8 @@ class TestSpawningThread(threading.Threa
       args.append('--fsfs-compression=' + options.fsfs_compression)
     if options.fsfs_dir_deltification:
       args.append('--fsfs-dir-deltification=' + options.fsfs_dir_deltification)
+    if options.svn_bin:
+      args.append('--bin=' + options.svn_bin)
 
     result, stdout_lines, stderr_lines = spawn_process(command, 0, False, None,
                                                        *args)


Reply via email to