subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1833487 - in /subversion/branches/1.10.x: ./ STATUS build/generator/gen_make.py subversion/tests/cmdline/svntest/main.py
Date Thu, 14 Jun 2018 04:00:08 GMT
Author: svn-role
Date: Thu Jun 14 04:00:08 2018
New Revision: 1833487

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

 * r1830885,r1831540
   Ensure consistent use of $PYTHON during build and test.
   Justification:
     Fixes potential build issues when multiple Python interpreters are
     installed, and aids with Python 2 to 3 migration.
   Votes:
     +1: jorton, rhuijben, philip

Modified:
    subversion/branches/1.10.x/   (props changed)
    subversion/branches/1.10.x/STATUS
    subversion/branches/1.10.x/build/generator/gen_make.py
    subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py

Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 14 04:00:08 2018
@@ -101,4 +101,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,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829344,1831110,1831112
+/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,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829344,1830885,1831110,1831112,1831540

Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1833487&r1=1833486&r2=1833487&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Jun 14 04:00:08 2018
@@ -38,14 +38,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1830885,r1831540
-   Ensure consistent use of $PYTHON during build and test.
-   Justification:
-     Fixes potential build issues when multiple Python interpreters are
-     installed, and aids with Python 2 to 3 migration.
-   Votes:
-     +1: jorton, rhuijben, philip
-
  * r1829260
    Revert r1751167, since it broke use of pre-generated Swig bindings in
    release builds.

Modified: subversion/branches/1.10.x/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/build/generator/gen_make.py?rev=1833487&r1=1833486&r2=1833487&view=diff
==============================================================================
--- subversion/branches/1.10.x/build/generator/gen_make.py (original)
+++ subversion/branches/1.10.x/build/generator/gen_make.py Thu Jun 14 04:00:08 2018
@@ -507,7 +507,7 @@ class Generator(gen_base.GeneratorBase):
     standalone.write('top_srcdir = .\n')
     standalone.write('top_builddir = .\n')
     standalone.write('SWIG = swig\n')
-    standalone.write('PYTHON = python\n')
+    standalone.write('PYTHON = ' + sys.executable + '\n')
     standalone.write('\n')
     standalone.write(open("build-outputs.mk","r").read())
     standalone.close()

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=1833487&r1=1833486&r2=1833487&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 Thu Jun 14 04:00:08
2018
@@ -452,9 +452,9 @@ def open_pipe(command, bufsize=-1, stdin
   should be passed to wait_on_pipe."""
   command = [str(x) for x in command]
 
-  # On Windows subprocess.Popen() won't accept a Python script as
-  # a valid program to execute, rather it wants the Python executable.
-  if (sys.platform == 'win32') and (command[0].endswith('.py')):
+  # Always run python scripts under the same Python executable as used
+  # for the test suite.
+  if command[0].endswith('.py'):
     command.insert(0, sys.executable)
 
   command_string = command[0] + ' ' + ' '.join(map(_quote_arg, command[1:]))



Mime
View raw message