You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2021/04/15 22:47:44 UTC
[cassandra] branch cassandra-3.0 updated (2a6059e -> 5f1b538)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 2a6059e Merge branch 'cassandra-2.2' into cassandra-3.0
new c52f50f Restore running each test class in its own separate jvm and cassandra directory (Remove test parallelism from ant build.xml)
new 5f1b538 Merge branch 'cassandra-2.2' into cassandra-3.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 66 ++++++++++++++++------
.../cassandra/OffsetAwareConfigurationLoader.java | 64 ---------------------
2 files changed, 49 insertions(+), 81 deletions(-)
delete mode 100644 test/unit/org/apache/cassandra/OffsetAwareConfigurationLoader.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-2.2' into cassandra-3.0
Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5f1b538ef55dcebb0fa4ac0ad1728c38469cfae0
Merge: 2a6059e c52f50f
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Fri Apr 16 00:40:53 2021 +0200
Merge branch 'cassandra-2.2' into cassandra-3.0
build.xml | 66 ++++++++++++++++------
.../cassandra/OffsetAwareConfigurationLoader.java | 64 ---------------------
2 files changed, 49 insertions(+), 81 deletions(-)
diff --cc build.xml
index 9c778ae,95f85c0..c6603a0
--- a/build.xml
+++ b/build.xml
@@@ -1236,11 -1317,10 +1273,10 @@@
<attribute name="filter" default="**/${test.name}.java"/>
<attribute name="exclude" default="" />
<attribute name="filelist" default="" />
- <attribute name="poffset" default="0"/>
<attribute name="testtag" default=""/>
-
<attribute name="usejacoco" default="no"/>
<attribute name="showoutput" default="false"/>
+
<sequential>
<condition property="additionalagent"
value="-javaagent:${build.dir.lib}/jars/jacocoagent.jar=destfile=${jacoco.partialexecfile}"
@@@ -1272,20 -1351,15 +1308,19 @@@
<jvmarg value="-XX:SoftRefLRUPolicyMSPerMB=0" />
<jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
<jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
- <jvmarg value="-Dcassandra.test.offsetseed=@{poffset}"/>
<jvmarg value="-Dcassandra.test.sstableformatdevelopment=true"/>
- <jvmarg value="-Dcassandra.testtag=@{testtag}"/>
<!-- The first time SecureRandom initializes can be slow if it blocks on /dev/random -->
<jvmarg value="-Djava.security.egd=file:/dev/urandom" />
+ <jvmarg value="-Dcassandra.testtag=@{testtag}"/>
+ <jvmarg value="-Dcassandra.keepBriefBrief=${cassandra.keepBriefBrief}" />
+ <jvmarg value="-Dcassandra.strict.runtime.checks=true" />
+ <!-- disable shrinks in quicktheories CASSANDRA-15554 -->
+ <jvmarg value="-DQT_SHRINKS=0"/>
<optjvmargs/>
<classpath>
+ <pathelement path="${java.class.path}"/>
<path refid="cassandra.classpath" />
<pathelement location="${test.classes}"/>
- <path refid="cobertura.classpath"/>
<pathelement location="${test.conf}"/>
<fileset dir="${test.lib}">
<include name="**/*.jar" />
@@@ -1295,10 -1369,10 +1330,10 @@@
<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}"/>
+ <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/commitlog"/>
+ <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/data"/>
+ <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/saved_caches"/>
</sequential>
</macrodef>
@@@ -1439,11 -1509,11 +1472,11 @@@
<fileset file="${test.conf}/commitlog_compression.yaml"/>
</concat>
<path id="all-test-classes-path">
- <fileset dir="${test.unit.src}" excludes="**/pig/*.java" includes="**/${test.name}.java" />
+ <fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
<fileset dir="${test.distributed.src}" includes="**/${test.name}.java" />
</path>
- <property name="test.file.list" refid="all-test-classes-path"/>
- <testlist-compression test.file.list="${test.file.list}"/>
+ <property name="all-test-classes" refid="all-test-classes-path"/>
+ <testhelper testdelegate="testlist-compression" />
</target>
<target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations">
@@@ -1684,10 -1797,10 +1716,10 @@@
<target name="test" depends="eclipse-warnings,build-test" description="Test Runner">
<path id="all-test-classes-path">
- <fileset dir="${test.unit.src}" includes="**/${test.name}.java" excludes="**/pig/*.java **/distributed/test/UpgradeTest*.java" />
+ <fileset dir="${test.unit.src}" includes="**/${test.name}.java" excludes="**/distributed/test/UpgradeTest*.java" />
</path>
- <property name="test.file.list" refid="all-test-classes-path"/>
- <testlist test.file.list="${test.file.list}"/>
+ <property name="all-test-classes" refid="all-test-classes-path"/>
+ <testhelper testdelegate="testlist"/>
</target>
<target name="generate-test-report" description="Generates JUnit's HTML report from results already in build/output">
@@@ -1714,10 -1827,23 +1746,10 @@@
<path id="all-test-classes-path">
<fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/>
</path>
- <property name="test.file.list" refid="all-test-classes-path"/>
- <testlist-compression test.file.list="${test.file.list}"/>
+ <property name="all-test-classes" refid="all-test-classes-path"/>
+ <testhelper testdelegate="testlist-compression"/>
</target>
- <target name="test-distributed" depends="build-test" description="Execute unit tests">
- <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true" filter="**/test/*Test.java">
- <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
- <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
- <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
- <jvmarg value="-Dcassandra.skip_sync=true" />
- <jvmarg value="-XX:MaxMetaspaceSize=256M" />
- <jvmarg value="-XX:SoftRefLRUPolicyMSPerMB=0" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <jvmarg value="-XX:HeapDumpPath=build/test/oom.hprof" />
- </testmacro>
- </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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org