This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e9209527f2962182ed82347d6183bae0a1189a25
Merge: 8257868 1ee18ac
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Fri Mar 19 17:59:23 2021 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
build.xml | 46 ----------
.../cassandra/distributed/test/TestLocator.java | 99 ----------------------
3 files changed, 1 insertion(+), 145 deletions(-)
diff --cc build.xml
index 5726fed,ad40e59..68f7556
--- a/build.xml
+++ b/build.xml
@@@ -1874,35 -1820,7 +1871,14 @@@
<property name="all-test-classes" refid="all-test-classes-path"/>
<testparallel testdelegate="testlist-compression"/>
</target>
+ <target name="testclasslist-cdc" depends="build-test"
description="Parallel-run tests given in file -Dtest.classlistfile
(one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
+ <path id="all-test-classes-path">
+ <fileset dir="${test.dir}/${test.classlistprefix}"
includesfile="${test.classlistfile}"/>
+ </path>
+ <property name="all-test-classes" refid="all-test-classes-path"/>
+ <testparallel testdelegate="testlist-cdc"/>
+ </target>
- <!-- In-JVM dtest targets -->
- <target name="list-jvm-dtests" depends="build-test">
- <java classname="org.apache.cassandra.distributed.test.TestLocator"
fork="no">
- <classpath>
- <path refid="cassandra.classpath" />
- <pathelement location="${test.classes}"/>
- <pathelement location="${test.conf}"/>
- <fileset dir="${test.lib}">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- <arg value="${test.distributed.listfile}"/>
- </java>
- </target>
-
- <target name="test-jvm-dtest-forking" depends="list-jvm-dtests"
description="Execute In-JVM 'distributed' tests" >
- <chmod file="${test.distributed.listfile}" perm="+x"/>
- <exec executable="./${test.distributed.listfile}" failonerror="true"/>
- <delete file="${test.distributed.listfile}"/>
- </target>
-
<target name="dtest-jar" depends="build-test, build" description="Create
dtest-compatible jar, including all dependencies">
<jar jarfile="${build.dir}/dtest-${base.version}.jar">
<zipgroupfileset dir="${build.lib}" includes="*.jar"
excludes="META-INF/*.SF"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
