This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 439e0b055db2ebe63b32342240483a930a5dfab1
Merge: b29af29 fa403bb
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Wed Mar 25 09:23:18 2020 +0100

    Merge branch 'cassandra-3.11' into trunk

 build.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --cc build.xml
index 6c816eb,400a707..7af1775
--- a/build.xml
+++ b/build.xml
@@@ -1558,16 -1431,9 +1562,11 @@@
    <target name="burn-testsome" depends="build-test" description="Execute 
specific burn unit tests" >
      <testmacro inputdir="${test.burn.src}" timeout="${test.burn.timeout}">
        <test name="${test.name}" methods="${test.methods}"/>
 +      <jvmarg 
value="-Dlogback.configurationFile=test/conf/logback-burntest.xml"/>
      </testmacro>
    </target>
 +
-   <target name="test-compression" depends="build-test, stress-build, 
fqltool-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_${test.compression_algo}.yaml"/>
-     </concat>
+   <target name="test-compression" depends="build-test,stress-build" 
description="Execute unit tests with sstable compression enabled">
      <path id="all-test-classes-path">
        <fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
        <fileset dir="${test.distributed.src}" includes="**/${test.name}.java" 
/>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to