aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-01-09 02:03:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-09 02:03:10 +0000
commit8ba772db18a24495412f9bc5e0e08c4c9a0ad709 (patch)
treec7d9811d29ba5a0d8386d3ee0ed85bb0d6b5d7e4
parent77788179d0fb04b3c499b266ad55c481c6b3dda9 (diff)
parent4a6ac12444cc5c7b0a8fe1c2909fb78002cea488 (diff)
downloadexternal_llvm-8ba772db18a24495412f9bc5e0e08c4c9a0ad709.zip
external_llvm-8ba772db18a24495412f9bc5e0e08c4c9a0ad709.tar.gz
external_llvm-8ba772db18a24495412f9bc5e0e08c4c9a0ad709.tar.bz2
am 4a6ac124: am 70fd1f24: Merge "lit: Don\'t use python 2.6 features"
* commit '4a6ac12444cc5c7b0a8fe1c2909fb78002cea488': lit: Don't use python 2.6 features
-rw-r--r--utils/lit/lit/TestRunner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py
index 1a2df20..2993f62 100644
--- a/utils/lit/lit/TestRunner.py
+++ b/utils/lit/lit/TestRunner.py
@@ -152,7 +152,7 @@ def executeShCmd(cmd, cfg, cwd, results):
stderr = stderr,
env = cfg.environment,
close_fds = kUseCloseFDs))
- except OSError as e:
+ except OSError, e:
raise InternalShellError(j, 'Could not create process due to {}'.format(e))
# Immediately close stdin for any process taking stdin from us.