changeset 15913:67e0015b21d6

Use new jacocoreport version
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 26 May 2014 18:18:19 +0200
parents c44f617fb8d7
children 88a6017687c9 7c84f0ce7cae
files mx/mx_graal.py mx/projects
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Mon May 26 17:43:45 2014 +0200
+++ b/mx/mx_graal.py	Mon May 26 18:18:19 2014 +0200
@@ -1834,7 +1834,7 @@
         out = args[0]
     elif len(args) > 1:
         mx.abort('jacocoreport takes only one argument : an output directory')
-    mx.run_java(['-jar', jacocoreport.get_path(True), '-in', 'jacoco.exec', '-g', join(_graal_home, 'graal'), out])
+    mx.run_java(['-jar', jacocoreport.get_path(True), '--in', 'jacoco.exec', '--out', out] + [p.dir for p in mx.projects()])
 
 def sl(args):
     """run an SL program"""
--- a/mx/projects	Mon May 26 17:43:45 2014 +0200
+++ b/mx/projects	Mon May 26 18:18:19 2014 +0200
@@ -36,8 +36,8 @@
 library@JACOCOAGENT@sha1=2f73a645b02e39290e577ce555f00b02004650b0
 
 library@JACOCOREPORT@path=lib/jacocoreport.jar
-library@JACOCOREPORT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoreport-0.7.1-1.jar
-library@JACOCOREPORT@sha1=0c5db714804416dd1df4d8110762136ce3d5c7dc
+library@JACOCOREPORT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoreport-0.7.1-2.jar
+library@JACOCOREPORT@sha1=a630436391832d697a12c8f7daef8655d7a1efd2
 
 library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0-20120216.jar
 library@DACAPO_SCALA@urls=http://repo.scalabench.org/snapshots/org/scalabench/benchmarks/scala-benchmark-suite/0.1.0-SNAPSHOT/scala-benchmark-suite-0.1.0-20120216.103539-3.jar