Merge pull request #4218 from jediry/fix_runtest_py

Fix excessive path escaping in runtest py

Author: bdbaddog

CHANGES.txt

@@ -20,6 +20,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
   From Flaviu Tamas
     - Added -fsanitize support to ParseFlags().  This will propagate to CCFLAGS and LINKFLAGS.
 
+  From Ryan Saunders
+    - Fixed runtest.py failure on Windows caused by excessive escaping of the path to python.exe.
 
 RELEASE 4.4.0 -  Sat, 30 Jul 2022 14:08:29 -0700
 

runtest.py

@@ -22,7 +22,6 @@
 import argparse
 import glob
 import os
-import re
 import stat
 import subprocess
 import sys
@@ -311,15 +310,6 @@ def get_template_command(filetype, verb=None):
         return buf.value
 
 
-_ws = re.compile(r'\s')
-
-def escape(s):
-    if _ws.search(s):
-        s = '"' + s + '"'
-    s = s.replace('\\', '\\\\')
-    return s
-
-
 if not catch_output:
     # Without any output suppressed, we let the subprocess
     # write its stuff freely to stdout/stderr.
@@ -432,8 +422,7 @@ class PopenExecutor(RuntestBase):
 
     A bit of a misnomer as the Popen call is now wrapped
     by calling subprocess.run (behind the covers uses Popen.
-    Very similar to SystemExecutor, but uses command_str
-    instead of command_args, and doesn't allow for not catching
+    Very similar to SystemExecutor, but doesn't allow for not catching
     the output).
     """
     # For an explanation of the following 'if ... else'
@@ -447,7 +436,7 @@ def execute(self, env):
             tmp_stderr = tempfile.TemporaryFile(mode='w+t')
             # Start subprocess...
             cp = subprocess.run(
-                self.command_str.split(),
+                self.command_args,
                 stdout=tmp_stdout,
                 stderr=tmp_stderr,
                 shell=False,
@@ -470,7 +459,7 @@ def execute(self, env):
 
         def execute(self, env):
             cp = subprocess.run(
-                self.command_str.split(),
+                self.command_args,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 shell=False,
@@ -784,7 +773,7 @@ def run_test(t, io_lock=None, run_async=True):
     if args.runner and t.path in unittests:
         # For example --runner TestUnit.TAPTestRunner
         command_args.append('--runner ' + args.runner)
-    t.command_args = [escape(args.python)] + command_args
+    t.command_args = [args.python] + command_args
     t.command_str = " ".join(t.command_args)
     if args.printcommand:
         if args.print_progress:

test/runtest/python.py

@@ -50,20 +50,12 @@
 # getting called with "/bin/../bin/python" as first argument, e.g. Fedora 17 Desktop.
 mypython = os.path.normpath(os.path.join(head, dir, os.path.pardir, dir, python))
 
-def escape(s):
-    return s.replace('\\', '\\\\')
-
-if re.search(r'\s', mypython):
-    mypythonstring = '"%s"' % escape(mypython)
-else:
-    mypythonstring = escape(mypython)
-
 test.subdir('test')
 
 test.write_passing_test(['test', 'pass.py'])
 
 expect_stdout = """\
-%(mypythonstring)s%(pythonflags)s %(test_pass_py)s
+%(mypython)s%(pythonflags)s %(test_pass_py)s
 PASSING TEST STDOUT
 """ % locals()
 

testing/framework/TestRuntest.py

@@ -51,11 +51,7 @@
     ]
 )
 
-if re.search(r'\s', python):
-    pythonstring = _python_
-else:
-    pythonstring = python
-pythonstring = pythonstring.replace('\\', '\\\\')
+pythonstring = python
 pythonflags = ''
 
 failing_test_template = """\