[llvm] r299209 - Use the current working directory in the glob expansion
Rafael Espindola via llvm-commits
llvm-commits at lists.llvm.org
Fri Mar 31 05:46:40 PDT 2017
Author: rafael
Date: Fri Mar 31 07:46:39 2017
New Revision: 299209
URL: http://llvm.org/viewvc/llvm-project?rev=299209&view=rev
Log:
Use the current working directory in the glob expansion
This fixes tests that do things like
mkdir <dir>
cd <dir>
..
<cmd> *.foo
Modified:
llvm/trunk/utils/lit/lit/ShCommands.py
llvm/trunk/utils/lit/lit/TestRunner.py
Modified: llvm/trunk/utils/lit/lit/ShCommands.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/ShCommands.py?rev=299209&r1=299208&r2=299209&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/ShCommands.py (original)
+++ llvm/trunk/utils/lit/lit/ShCommands.py Fri Mar 31 07:46:39 2017
@@ -48,9 +48,14 @@ class GlobItem:
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:
Modified: llvm/trunk/utils/lit/lit/TestRunner.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestRunner.py?rev=299209&r1=299208&r2=299209&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/TestRunner.py (original)
+++ llvm/trunk/utils/lit/lit/TestRunner.py Fri Mar 31 07:46:39 2017
@@ -142,15 +142,15 @@ def executeShCmd(cmd, shenv, results, ti
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):
@@ -325,7 +325,7 @@ def _executeShCmd(cmd, shenv, results, t
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]
@@ -389,7 +389,7 @@ def _executeShCmd(cmd, shenv, results, t
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.
More information about the llvm-commits
mailing list