diff options
| -rw-r--r-- | utils/lit/lit/LitConfig.py | 2 | ||||
| -rw-r--r-- | utils/lit/lit/TestRunner.py | 3 | ||||
| -rw-r--r-- | utils/lit/lit/__init__.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/utils/lit/lit/LitConfig.py b/utils/lit/lit/LitConfig.py index bd7a603122..9a5ff9973c 100644 --- a/utils/lit/lit/LitConfig.py +++ b/utils/lit/lit/LitConfig.py @@ -32,7 +32,7 @@ class LitConfig: # The name of the test runner. self.progname = progname # The items to add to the PATH environment variable. - self.path = list(map(str, path)) + self.path = list([str(p) for p in path]) self.quiet = bool(quiet) self.useValgrind = bool(useValgrind) self.valgrindLeakCheck = bool(valgrindLeakCheck) diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py index 989a992ef8..1beb92c1d1 100644 --- a/utils/lit/lit/TestRunner.py +++ b/utils/lit/lit/TestRunner.py @@ -416,7 +416,8 @@ def parseIntegratedTestScript(test, normalize_slashes=False, # Strip the trailing newline and any extra whitespace. return ln.strip() - script = map(processLine, script) + script = [processLine(ln) + for ln in script] # Verify the script contains a run line. if not script: diff --git a/utils/lit/lit/__init__.py b/utils/lit/lit/__init__.py index b9f573d931..3967fdd020 100644 --- a/utils/lit/lit/__init__.py +++ b/utils/lit/lit/__init__.py @@ -6,6 +6,6 @@ from .main import main __author__ = 'Daniel Dunbar' __email__ = 'daniel@zuster.org' __versioninfo__ = (0, 3, 0) -__version__ = '.'.join(map(str, __versioninfo__)) + 'dev' +__version__ = '.'.join(str(v) for v in __versioninfo__) + 'dev' __all__ = [] |