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
The following commit(s) were added to refs/heads/cassandra-3.11 by this push:
new fa403bb Jenkins tests to use testclasslist where possible (like
CircleCI)
fa403bb is described below
commit fa403bb7210de650d6068cee1cb7e4e26ba777bb
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Sat Mar 21 12:53:40 2020 +0100
Jenkins tests to use testclasslist where possible (like CircleCI)
patch by Mick Semb Wever; reviewed by David Capwell for CASSANDRA-15651
---
build.xml | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/build.xml b/build.xml
index 87595bf..400a707 100644
--- a/build.xml
+++ b/build.xml
@@ -1380,6 +1380,10 @@
<attribute name="testlist.offset" />
<sequential>
<property name="cdc_yaml" value="${build.test.dir}/cassandra.cdc.yaml"/>
+ <concat destfile="${cdc_yaml}">
+ <fileset file="${test.conf}/cassandra.yaml"/>
+ <fileset file="${test.conf}/cdc.yaml"/>
+ </concat>
<testmacrohelper inputdir="${test.unit.src}"
filelist="@{test.file.list}" poffset="@{testlist.offset}"
exclude="**/*.java" timeout="${test.timeout}"
testtag="cdc">
<jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
@@ -1430,11 +1434,6 @@
</testmacro>
</target>
<target name="test-compression" depends="build-test,stress-build"
description="Execute unit tests with sstable compression enabled">
- <property name="compressed_yaml"
value="${build.test.dir}/cassandra.compressed.yaml"/>
- <concat destfile="${compressed_yaml}">
- <fileset file="${test.conf}/cassandra.yaml"/>
- <fileset file="${test.conf}/commitlog_compression.yaml"/>
- </concat>
<path id="all-test-classes-path">
<fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
<fileset dir="${test.distributed.src}" includes="**/${test.name}.java" />
@@ -1444,11 +1443,6 @@
</target>
<target name="test-cdc" depends="build-test" description="Execute unit tests
with change-data-capture enabled">
- <property name="cdc_yaml" value="${build.test.dir}/cassandra.cdc.yaml"/>
- <concat destfile="${cdc_yaml}">
- <fileset file="${test.conf}/cassandra.yaml"/>
- <fileset file="${test.conf}/cdc.yaml"/>
- </concat>
<path id="all-test-classes-path">
<fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
</path>
@@ -1826,6 +1820,13 @@
<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">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
