Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08363afa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08363afa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08363afa Branch: refs/heads/cassandra-3.11 Commit: 08363afa5354c00a7ecd62fe273c392a678db28a Parents: 27c53b5 23d722e Author: Marcus Eriksson <[email protected]> Authored: Thu Dec 20 13:41:48 2018 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Thu Dec 20 13:41:48 2018 +0100 ---------------------------------------------------------------------- build.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08363afa/build.xml ---------------------------------------------------------------------- diff --cc build.xml index c9565f8,7e85991..8fefd17 --- a/build.xml +++ b/build.xml @@@ -1174,31 -1130,8 +1174,28 @@@ </rat:report> </target> + <target name="build-jmh" depends="build-test" description="Create JMH uber jar"> + <jar jarfile="${build.test.dir}/deps.jar"> + <zipgroupfileset dir="${build.dir.lib}/jars"> + <include name="*jmh*.jar"/> + <include name="jopt*.jar"/> + <include name="commons*.jar"/> + </zipgroupfileset> + <zipgroupfileset dir="${build.lib}" includes="*.jar"/> + </jar> + <jar jarfile="${build.test.dir}/benchmarks.jar"> + <manifest> + <attribute name="Main-Class" value="org.openjdk.jmh.Main"/> + </manifest> + <zipfileset src="${build.test.dir}/deps.jar" excludes="META-INF/*.SF" /> + <fileset dir="${build.classes.main}"/> + <fileset dir="${test.classes}"/> + </jar> + </target> + - <!-- use https://github.com/krummas/jstackjunit to get thread dumps when unit tests time out --> - <taskdef name="junit" classname="org.krummas.junit.JStackJUnitTask" classpath="lib/jstackjunit-0.0.1.jar"/> - <target name="build-test" depends="build" description="Compile test classes"> <javac + compiler="modern" debug="true" debuglevel="${debuglevel}" destdir="${test.classes}" @@@ -1282,21 -1215,10 +1281,21 @@@ <fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/> <filelist dir="@{inputdir}" files="@{filelist}"/> </batchtest> - </junit> + </junit-timeout> - <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/commitlog:@{poffset}"/> - <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/data:@{poffset}"/> - <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/saved_caches:@{poffset}"/> + + <condition property="fileSep" value=";"> + <os family="windows"/> + </condition> + <condition property="fileSep" else=":"> + <isset property="fileSep"/> + </condition> + <fail unless="fileSep">Failed to set File Separator. This shouldn't happen.</fail> + + <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/commitlog${fileSep}@{poffset}"/> + <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/cdc_raw${fileSep}@{poffset}"/> + <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/data${fileSep}@{poffset}"/> + <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/saved_caches${fileSep}@{poffset}"/> + <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/hints${fileSep}@{poffset}"/> </sequential> </macrodef> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
