aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Liew <dan@su-root.co.uk>2018-09-24 09:30:33 +0000
committerDan Liew <dan@su-root.co.uk>2018-09-24 09:30:33 +0000
commit706829da93a37ad9059950c01e623114319df4c7 (patch)
tree2c8a6546af296cf320ab59b9eb1974f9ea424370
parent603f94a9c01c529bf7646780e74ff606b75a158a (diff)
When running the ios/iossim prepare script show the script output when it returns with a non-zero exit code.
Summary: Previously we'd just show the exception and not the output from the executed script. This is unhelpful in the case that the script actually reports some useful information on the failure. Now we print the output and re-raise the exception. Reviewers: kubamracek, george.karpenkov Subscribers: #sanitizers, llvm-commits Differential Revision: https://reviews.llvm.org/D52350 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@342869 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/lit.common.cfg7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/lit.common.cfg b/test/lit.common.cfg
index df8943aff..0c2355f1d 100644
--- a/test/lit.common.cfg
+++ b/test/lit.common.cfg
@@ -157,7 +157,12 @@ elif config.host_os == 'Darwin' and config.apple_platform != "osx":
config.substitutions.append(('%device_rm', '{} rm '.format(run_wrapper)))
config.compile_wrapper = compile_wrapper
- prepare_output = subprocess.check_output([prepare_script, config.apple_platform, config.clang]).strip()
+ try:
+ prepare_output = subprocess.check_output([prepare_script, config.apple_platform, config.clang]).strip()
+ except subprocess.CalledProcessError as e:
+ print("Command failed:")
+ print(e.output)
+ raise e
if len(prepare_output) > 0: print(prepare_output)
prepare_output_json = prepare_output.split("\n")[-1]
prepare_output = json.loads(prepare_output_json)