diff options
| -rw-r--r-- | llvm/utils/lit/lit/formats/googletest.py | 3 | ||||
| -rw-r--r-- | llvm/utils/lit/lit/util.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/llvm/utils/lit/lit/formats/googletest.py b/llvm/utils/lit/lit/formats/googletest.py index f0250a3f96d..8796eb5af22 100644 --- a/llvm/utils/lit/lit/formats/googletest.py +++ b/llvm/utils/lit/lit/formats/googletest.py @@ -35,7 +35,8 @@ class GoogleTest(TestFormat): lines = lines.replace('\r', '') lines = lines.split('\n') except: - litConfig.error("unable to discover google-tests in %r" % path) + litConfig.error("unable to discover google-tests in %r: %s" + % (path, sys.exc_info()[1])) raise StopIteration nested_tests = [] diff --git a/llvm/utils/lit/lit/util.py b/llvm/utils/lit/lit/util.py index 40a57716869..288931a10ab 100644 --- a/llvm/utils/lit/lit/util.py +++ b/llvm/utils/lit/lit/util.py @@ -65,10 +65,13 @@ def mkdir_p(path): def capture(args, env=None): """capture(command) - Run the given command (or argv list) in a shell and - return the standard output.""" + return the standard output. Raises a CalledProcessError if the command + exits with a non-zero status.""" p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env) out,_ = p.communicate() + if p.returncode != 0: + raise subprocess.CalledProcessError(cmd=args, returncode=p.returncode) return convert_string(out) def which(command, paths = None): |
