Use the current working directory in the glob expansion

[• rafael]

Summary

This fixes tests that do things like

mkdir <dir>
cd <dir>
..
<cmd> *.foo

[rnk]

lgtm

utils/lit/lit/ShCommands.py

def __repr__(self):
         return self.pattern
 
     def __eq__(self, other):
         if not isinstance(other, Command):
             return False
 
         return (self.pattern == other.pattern)
 
-    def resolve(self):
+    def resolve(self, cwd):
         import glob
-        results = glob.glob(self.pattern)
+        import os
+        if os.path.isabs(self.pattern):
+           abspath = self.pattern
+        else:
+            abspath = os.path.join(cwd, self.pattern)
+        results = glob.glob(abspath)
         return [self.pattern] if len(results) == 0 else results
 
 class Pipeline:
     def __init__(self, commands, negate=False, pipe_err=False):
         self.commands = commands
         self.negate = negate
         self.pipe_err = pipe_err
 

utils/lit/lit/TestRunner.py

def executeShCmd(cmd, shenv, results, timeout=0):
     finalExitCode = _executeShCmd(cmd, shenv, results, timeoutHelper)
     timeoutHelper.cancel()
     timeoutInfo = None
     if timeoutHelper.timeoutReached():
         timeoutInfo = 'Reached timeout of {} seconds'.format(timeout)
 
     return (finalExitCode, timeoutInfo)
 
-def expand_glob(arg):
+def expand_glob(arg, cwd):
     if isinstance(arg, GlobItem):
-        return arg.resolve()
+        return arg.resolve(cwd)
     return [arg]
 
-def expand_glob_expressions(args):
+def expand_glob_expressions(args, cwd):
     result = [args[0]]
     for arg in args[1:]:
-        result.extend(expand_glob(arg))
+        result.extend(expand_glob(arg, cwd))
     return result
 
 def quote_windows_command(seq):
     """
     Reimplement Python's private subprocess.list2cmdline for MSys compatibility
 
     Based on CPython implementation here:
       https://hg.python.org/cpython/file/849826a900d2/Lib/subprocess.py#l422
for i,j in enumerate(cmd.commands):
                     result = subprocess.STDOUT
             elif r == (2,):
                 if index != 2:
                     raise InternalShellError(j,"Unsupported redirect on stdout")
                 result = subprocess.PIPE
             else:
                 if r[2] is None:
                     redir_filename = None
-                    name = expand_glob(r[0])
+                    name = expand_glob(r[0], cmd_shenv.cwd)
                     if len(name) != 1:
                        raise InternalShellError(j,"Unsupported: glob in redirect expanded to multiple files")
                     name = name[0]
                     if kAvoidDevNull and name == '/dev/null':
                         r[2] = tempfile.TemporaryFile(mode=r[1])
                     elif kIsWindows and name == '/dev/tty':
                         # Simulate /dev/tty on Windows.
                         # "CON" is a special filename for the console.
for i,j in enumerate(cmd.commands):
             for i,arg in enumerate(args):
                 if arg == "/dev/null":
                     f = tempfile.NamedTemporaryFile(delete=False)
                     f.close()
                     named_temp_files.append(f.name)
                     args[i] = f.name
 
         # Expand all glob expressions
-        args = expand_glob_expressions(args)
+        args = expand_glob_expressions(args, cmd_shenv.cwd)
 
         # On Windows, do our own command line quoting for better compatibility
         # with some core utility distributions.
         if kIsWindows:
             args = quote_windows_command(args)
 
         try:
             procs.append(subprocess.Popen(args, cwd=cmd_shenv.cwd,