changeset 15228:bc21a3b4d6d3

mx: show output of JMH build failure
author Doug Simon <doug.simon@oracle.com>
date Fri, 18 Apr 2014 13:39:53 +0200
parents 7be43cbf3568
children 5c9185d42a3a
files mx/mx_graal.py
diffstat 1 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Fri Apr 18 13:38:26 2014 +0200
+++ b/mx/mx_graal.py	Fri Apr 18 13:39:53 2014 +0200
@@ -1473,13 +1473,20 @@
                 buildJmh = True
 
     if buildJmh:
-        def _blackhole(x):
-            mx.logv(x[:-1])
+        buildOutput = []
+        def _redirect(x):
+            if mx._opts.verbose:
+                mx.log(x[:-1])
+            else:
+                buildOutput.append(x)
         env = os.environ.copy()
         env['JAVA_HOME'] = _jdk(vmToCheck='graal')
         env['MAVEN_OPTS'] = '-graal'
         mx.log("Building benchmarks...")
-        mx.run(['mvn', 'package'], cwd=jmhPath, out=_blackhole, env=env)
+        retcode = mx.run(['mvn', 'package'], cwd=jmhPath, out=_redirect, env=env, nonZeroIsFatal=False)
+        if retcode != 0:
+            mx.log(''.join(buildOutput))
+            mx.abort(retcode)
         timestamp.touch()
         with open(timestamp.path, 'w') as fp:
             fp.write('\n'.join(jmhTree))