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 <[email protected]> Authored: Thu Dec 20 13:44:53 2018 +0100 Committer: Marcus Eriksson <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
