aboutsummaryrefslogtreecommitdiff
path: root/org.jacoco.examples
diff options
context:
space:
mode:
authorEvgeny Mandrikov <mandrikov@gmail.com>2013-01-11 17:05:24 +0100
committerEvgeny Mandrikov <mandrikov@gmail.com>2013-01-11 17:05:24 +0100
commitee2d68716a953994f8c4e92dac549bfcc09da1a5 (patch)
treefe61314efea796df8acd69246f3c9c2e765e3ccc /org.jacoco.examples
parentccff137a82a3a7701671977405678f14ede21d65 (diff)
parentd718664d9ae73c37cea9d1082299b27e7b98a1c6 (diff)
downloadjacoco-ee2d68716a953994f8c4e92dac549bfcc09da1a5.tar.gz
Merge branch 'master' into issue-64
Conflicts: org.jacoco.doc/docroot/doc/changes.html
Diffstat (limited to 'org.jacoco.examples')
-rw-r--r--org.jacoco.examples/build/build-offline.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.jacoco.examples/build/build-offline.xml b/org.jacoco.examples/build/build-offline.xml
index c89dc5f4..cf20b50a 100644
--- a/org.jacoco.examples/build/build-offline.xml
+++ b/org.jacoco.examples/build/build-offline.xml
@@ -56,7 +56,7 @@
<pathelement path="${result.classes.instr.dir}" />
</classpath>
<!-- Agent is configured with system properties -->
- <sysproperty key="jacoco.destfile" file="${result.exec.file}"/>
+ <sysproperty key="jacoco-agent.destfile" file="${result.exec.file}"/>
<arg value="2 * 3 + 4"/>
<arg value="2 + 3 * 4"/>
<arg value="(2 + 3) * 4"/>