aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-01-09 01:56:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-09 01:56:33 +0000
commit4a6ac12444cc5c7b0a8fe1c2909fb78002cea488 (patch)
treec7d9811d29ba5a0d8386d3ee0ed85bb0d6b5d7e4
parent9bfc923ac66dfb3bb0a6725426e6616c032f9fbb (diff)
parent70fd1f24656a2a0f9ea114b4a780fe5d381de68d (diff)
downloadexternal_llvm-4a6ac12444cc5c7b0a8fe1c2909fb78002cea488.zip
external_llvm-4a6ac12444cc5c7b0a8fe1c2909fb78002cea488.tar.gz
external_llvm-4a6ac12444cc5c7b0a8fe1c2909fb78002cea488.tar.bz2
am 70fd1f24: Merge "lit: Don\'t use python 2.6 features"
* commit '70fd1f24656a2a0f9ea114b4a780fe5d381de68d': 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.