Author: danielsh
Date: Tue Oct 2 14:42:00 2018
New Revision: 1842626
URL: http://svn.apache.org/viewvc?rev=1842626&view=rev
Log:
Merge r1842260 from trunk:
* r1842260
Use the current python executable for launching tests from run_tests.py.
Justification:
Attempt to fix 1.10.x tests on the macOS build slave.
Votes:
+1: brane, rhuijben, danielsh
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/build/run_tests.py
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 2 14:42:00 2018
@@ -102,4 +102,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,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1840991,1842262,1842264
+/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,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1840991,1842260,1842262,1842264
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1842626&r1=1842625&r2=1842626&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Oct 2 14:42:00 2018
@@ -30,11 +30,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1842260
- Use the current python executable for launching tests from run_tests.py.
- Justification:
- Attempt to fix 1.10.x tests on the macOS build slave.
- Votes:
- +1: brane, rhuijben, danielsh
-
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=1842626&r1=1842625&r2=1842626&view=diff
==============================================================================
--- subversion/branches/1.10.x/build/run_tests.py (original)
+++ subversion/branches/1.10.x/build/run_tests.py Tue Oct 2 14:42:00 2018
@@ -327,7 +327,7 @@ class TestHarness:
def _command_line(self, harness):
if self.is_python:
cmdline = list(harness.py_test_cmdline)
- cmdline.insert(0, 'python')
+ cmdline.insert(0, sys.executable)
cmdline.insert(1, self.progabs)
# Run the test apps in "child process" mode,
# i.e. w/o cleaning up global directories etc.
@@ -375,7 +375,7 @@ class TestHarness:
def _count_py_tests(self, progabs, progdir, progbase):
'Run a c test, escaping parameters as required.'
- cmdline = [ 'python', progabs, '--list' ]
+ cmdline = [ sys.executable, progabs, '--list' ]
prog = subprocess.Popen(cmdline, stdout=subprocess.PIPE, cwd=progdir)
lines = prog.stdout.readlines()
@@ -448,6 +448,7 @@ class TestHarness:
job_queue = queue.Queue()
total_count = 0
scrambled = list(jobs)
+ # TODO: What's this line doing, and what's the magic number?
scrambled.sort(key=lambda x: ("1" if x.test_count() < 30 else "0") +
str(x.number))
for job in scrambled:
total_count += job.test_count()
