You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2018/12/20 12:47:15 UTC
[1/6] cassandra git commit: move task definition inside testmacro to
not fail build if ant-junit is not installed
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 1816520d6 -> 23d722ee3
refs/heads/cassandra-3.11 27c53b526 -> 08363afa5
refs/heads/trunk 0a79f9f5c -> 11384c327
move task definition inside testmacro to not fail build if ant-junit is not installed
Patch by marcuse; reviewed by Jon Meredith for CASSANDRA-14915
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23d722ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23d722ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23d722ee
Branch: refs/heads/cassandra-3.0
Commit: 23d722ee3a7b91bfe5ee6fe64d090ff247e80438
Parents: 1816520
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Nov 29 08:53:19 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Dec 20 13:38:28 2018 +0100
----------------------------------------------------------------------
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23d722ee/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d7e6c4b..7e85991 100644
--- a/build.xml
+++ b/build.xml
@@ -1130,8 +1130,6 @@
</rat:report>
</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
debug="true"
@@ -1180,10 +1178,12 @@
else="">
<istrue value="${usejacoco}"/>
</condition>
+ <!-- use https://github.com/krummas/jstackjunit to get thread dumps when unit tests time out -->
+ <taskdef name="junit-timeout" classname="org.krummas.junit.JStackJUnitTask" classpath="lib/jstackjunit-0.0.1.jar"/>
<mkdir dir="${build.test.dir}/cassandra"/>
<mkdir dir="${build.test.dir}/output"/>
<mkdir dir="${build.test.dir}/output/@{testtag}"/>
- <junit fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}">
+ <junit-timeout fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}">
<formatter classname="org.apache.cassandra.CassandraXMLJUnitResultFormatter" extension=".xml" usefile="true"/>
<formatter classname="org.apache.cassandra.CassandraBriefJUnitResultFormatter" usefile="false"/>
<jvmarg value="-Dstorage-config=${test.conf}"/>
@@ -1215,7 +1215,7 @@
<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}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11384c32
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11384c32
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11384c32
Branch: refs/heads/trunk
Commit: 11384c3279a66e6c0fb7861e2b188b25e963580f
Parents: 0a79f9f 08363af
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Dec 20 13:44:53 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Dec 20 13:44:53 2018 +0100
----------------------------------------------------------------------
build.xml | 9 ++++-----
doc/source/development/testing.rst | 8 ++++++++
2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/11384c32/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index f24647e,8fefd17..3973689
--- a/build.xml
+++ b/build.xml
@@@ -1235,10 -1193,7 +1235,7 @@@
</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">
+ <target name="build-test" depends="_main-jar, stress-build, fqltool-build, write-poms" description="Compile test classes">
<javac
compiler="modern"
debug="true"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/11384c32/doc/source/development/testing.rst
----------------------------------------------------------------------
diff --cc doc/source/development/testing.rst
index eb79932,b8eea6b..7f38fe5
--- a/doc/source/development/testing.rst
+++ b/doc/source/development/testing.rst
@@@ -52,6 -51,6 +52,14 @@@ To run only the ``testStaticCompactTabl
ant testsome -Dtest.name=org.apache.cassandra.cql3.SimpleQueryTest -Dtest.methods=testStaticCompactTables
++If you see an error like this::
++
++ Throws: cassandra-trunk/build.xml:1134: taskdef A class needed by class org.krummas.junit.JStackJUnitTask cannot be found:
++ org/apache/tools/ant/taskdefs/optional/junit/JUnitTask using the classloader
++ AntClassLoader[/.../cassandra-trunk/lib/jstackjunit-0.0.1.jar]
++
++You will need to install the ant-optional package since it contains the ``JUnitTask`` class.
++
Long running tests
------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ma...@apache.org.
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/trunk
Commit: 08363afa5354c00a7ecd62fe273c392a678db28a
Parents: 27c53b5 23d722e
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Dec 20 13:41:48 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ma...@apache.org.
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 <ma...@apache.org>
Authored: Thu Dec 20 13:41:48 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: move task definition inside testmacro to
not fail build if ant-junit is not installed
Posted by ma...@apache.org.
move task definition inside testmacro to not fail build if ant-junit is not installed
Patch by marcuse; reviewed by Jon Meredith for CASSANDRA-14915
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23d722ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23d722ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23d722ee
Branch: refs/heads/cassandra-3.11
Commit: 23d722ee3a7b91bfe5ee6fe64d090ff247e80438
Parents: 1816520
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Nov 29 08:53:19 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Dec 20 13:38:28 2018 +0100
----------------------------------------------------------------------
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23d722ee/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d7e6c4b..7e85991 100644
--- a/build.xml
+++ b/build.xml
@@ -1130,8 +1130,6 @@
</rat:report>
</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
debug="true"
@@ -1180,10 +1178,12 @@
else="">
<istrue value="${usejacoco}"/>
</condition>
+ <!-- use https://github.com/krummas/jstackjunit to get thread dumps when unit tests time out -->
+ <taskdef name="junit-timeout" classname="org.krummas.junit.JStackJUnitTask" classpath="lib/jstackjunit-0.0.1.jar"/>
<mkdir dir="${build.test.dir}/cassandra"/>
<mkdir dir="${build.test.dir}/output"/>
<mkdir dir="${build.test.dir}/output/@{testtag}"/>
- <junit fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}">
+ <junit-timeout fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}">
<formatter classname="org.apache.cassandra.CassandraXMLJUnitResultFormatter" extension=".xml" usefile="true"/>
<formatter classname="org.apache.cassandra.CassandraBriefJUnitResultFormatter" usefile="false"/>
<jvmarg value="-Dstorage-config=${test.conf}"/>
@@ -1215,7 +1215,7 @@
<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}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: move task definition inside testmacro to
not fail build if ant-junit is not installed
Posted by ma...@apache.org.
move task definition inside testmacro to not fail build if ant-junit is not installed
Patch by marcuse; reviewed by Jon Meredith for CASSANDRA-14915
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23d722ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23d722ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23d722ee
Branch: refs/heads/trunk
Commit: 23d722ee3a7b91bfe5ee6fe64d090ff247e80438
Parents: 1816520
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Nov 29 08:53:19 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Dec 20 13:38:28 2018 +0100
----------------------------------------------------------------------
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23d722ee/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d7e6c4b..7e85991 100644
--- a/build.xml
+++ b/build.xml
@@ -1130,8 +1130,6 @@
</rat:report>
</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
debug="true"
@@ -1180,10 +1178,12 @@
else="">
<istrue value="${usejacoco}"/>
</condition>
+ <!-- use https://github.com/krummas/jstackjunit to get thread dumps when unit tests time out -->
+ <taskdef name="junit-timeout" classname="org.krummas.junit.JStackJUnitTask" classpath="lib/jstackjunit-0.0.1.jar"/>
<mkdir dir="${build.test.dir}/cassandra"/>
<mkdir dir="${build.test.dir}/output"/>
<mkdir dir="${build.test.dir}/output/@{testtag}"/>
- <junit fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}">
+ <junit-timeout fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}">
<formatter classname="org.apache.cassandra.CassandraXMLJUnitResultFormatter" extension=".xml" usefile="true"/>
<formatter classname="org.apache.cassandra.CassandraBriefJUnitResultFormatter" usefile="false"/>
<jvmarg value="-Dstorage-config=${test.conf}"/>
@@ -1215,7 +1215,7 @@
<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}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org