summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-06-21 16:40:18 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2019-06-21 19:59:32 +0300
commit8328cb12e5000ea43cec5601ff77a273928149a6 (patch)
treef0b5a40ae161b8f7cc5dc4715aa66519075fd84d
parentb2cdf528b81d741e96767a88d86cb0d042d7b2ff (diff)
downloadmeson-fixci2.tar.gz
Increase logging for Rust CI failures.fixci2
-rw-r--r--mesonbuild/compilers/rust.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py
index 17b7e3b03..332cee681 100644
--- a/mesonbuild/compilers/rust.py
+++ b/mesonbuild/compilers/rust.py
@@ -47,10 +47,18 @@ class RustCompiler(Compiler):
ofile.write('''fn main() {
}
''')
- pc = subprocess.Popen(self.exelist + ['-o', output_name, source_name], cwd=work_dir)
- pc.wait()
+ pc = subprocess.Popen(self.exelist + ['-o', output_name, source_name],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ cwd=work_dir)
+ stdo, stde = pc.communicate()
+ stdo = stdo.decode('utf-8', errors='replace')
+ stde = stde.decode('utf-8', errors='replace')
if pc.returncode != 0:
- raise EnvironmentException('Rust compiler %s can not compile programs.' % self.name_string())
+ raise EnvironmentException('Rust compiler %s can not compile programs.\n%s\n%s' % (
+ self.name_string(),
+ stdo,
+ stde))
if self.is_cross:
if self.exe_wrapper is None:
# Can't check if the binaries run so we have to assume they do