Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/203efd02 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/203efd02 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/203efd02 Branch: refs/heads/trunk Commit: 203efd0221ba103be85e86d38278a996b31e88ad Parents: e9995c9 155eccd Author: Mikhail Stepura <mish...@apache.org> Authored: Fri Nov 7 13:46:10 2014 -0800 Committer: Mikhail Stepura <mish...@apache.org> Committed: Fri Nov 7 13:46:10 2014 -0800 ---------------------------------------------------------------------- build.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/203efd02/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 2cb637e,43fa531..5eb1955 --- a/build.xml +++ b/build.xml @@@ -1526,26 -1476,8 +1526,26 @@@ ]]> </script> </target> + <!-- run microbenchmarks suite --> + <target name="microbench" depends="build-test"> + <java classname="org.openjdk.jmh.Main" + fork="true" + failonerror="true"> + <classpath> + <path refid="cassandra.classpath" /> + <pathelement location="${test.classes}"/> + <path refid="cobertura.classpath"/> + <pathelement location="${test.conf}"/> + <fileset dir="${test.lib}"> + <include name="**/*.jar" /> + </fileset> + </classpath> + <arg value=".*microbench.*${benchmark.name}"/> + </java> + </target> + <!-- Generate Eclipse project description files --> - <target name="generate-eclipse-files" depends="build" description="Generate eclipse files"> + <target name="generate-eclipse-files" depends="build-test" description="Generate eclipse files"> <echo file=".project"><