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 2022/11/05 15:36:28 UTC
[cassandra] branch cassandra-4.0 updated (5e705a8492 -> 17e6942775)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 5e705a8492 Merge branch 'cassandra-3.11' into cassandra-4.0
new 30a3266780 ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
new f9b2cd6f3f Merge branch 'cassandra-3.0' into cassandra-3.11
new 17e6942775 Merge branch 'cassandra-3.11' into cassandra-4.0
The 3 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 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
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-3.11' into cassandra-4.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-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 17e694277597404aadfec664dfe4c11da7ed24a4
Merge: 5e705a8492 f9b2cd6f3f
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Sat Nov 5 15:51:47 2022 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --cc build.xml
index e11f5f6909,5e15f4923d..963761b230
--- a/build.xml
+++ b/build.xml
@@@ -953,58 -789,15 +953,58 @@@
</target>
<!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
- ant stress-test-some -Dtest.name=org.apache.cassandra.stress.settings.SettingsNodeTest
- ant stress-test-some -Dtest.name=org.apache.cassandra.stress.settings.SettingsNodeTest -Dtest.methods=testDefaults
+ ant stress-test-some -Dtest.name=org.apache.cassandra.stress.generate.DistributionGaussianTest
+ ant stress-test-some -Dtest.name=org.apache.cassandra.stress.generate.DistributionGaussianTest -Dtest.methods=simpleGaussian
-->
- <target name="stress-test-some" depends="stress-build-test, maybe-build-test" description="Runs stress tests">
+ <target name="stress-test-some" depends="maybe-build-test" description="Runs stress tests">
- <testmacro inputdir="${stress.test.src}"
- timeout="${test.timeout}">
- <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" outfile="build/test/output/TEST-${test.name}-${test.methods}"/>
- <test if:blank="${test.methods}" name="${test.name}" outfile="build/test/output/TEST-${test.name}"/>
- </testmacro>
+ <testmacro inputdir="${stress.test.src}"
+ timeout="${test.timeout}">
+ <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" outfile="build/test/output/TEST-${test.name}-${test.methods}"/>
+ <test if:blank="${test.methods}" name="${test.name}" outfile="build/test/output/TEST-${test.name}"/>
+ </testmacro>
+ </target>
+
+ <!--
+ fqltool build file
+ -->
+ <property name="fqltool.build.src" value="${basedir}/tools/fqltool/src" />
+ <property name="fqltool.test.src" value="${basedir}/tools/fqltool/test/unit" />
+ <property name="fqltool.build.classes" value="${build.classes}/fqltool" />
+ <property name="fqltool.test.classes" value="${build.dir}/test/fqltool-classes" />
+ <property name="fqltool.manifest" value="${fqltool.build.classes}/MANIFEST.MF" />
+
+ <target name="fqltool-build-test" depends="fqltool-build" description="Compile fqltool tests">
+ <javac debug="true" debuglevel="${debuglevel}" destdir="${fqltool.test.classes}"
+ source="${source.version}" target="${target.version}"
+ includeantruntime="false" encoding="utf-8">
+ <classpath>
+ <path refid="cassandra.classpath.test"/>
+ <pathelement location="${fqltool.build.classes}" />
+ </classpath>
+ <src path="${fqltool.test.src}"/>
+ </javac>
+ </target>
+
+ <target name="fqltool-build" depends="build" description="build fqltool">
+ <antcall target="_fqltool_build"/>
+ </target>
+
+ <target name="_fqltool_build">
+ <mkdir dir="${fqltool.build.classes}" />
+ <javac compiler="modern" debug="true" debuglevel="${debuglevel}"
+ source="${source.version}" target="${target.version}"
+ encoding="utf-8" destdir="${fqltool.build.classes}" includeantruntime="true">
+ <src path="${fqltool.build.src}" />
+ <classpath>
+ <path refid="cassandra.classpath" />
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="fqltool-test" depends="fqltool-build-test, maybe-build-test" description="Runs fqltool tests">
+ <testmacro inputdir="${fqltool.test.src}"
+ timeout="${test.timeout}">
+ </testmacro>
</target>
<target name="_write-poms" depends="maven-declare-dependencies">
@@@ -1269,15 -1101,10 +1269,15 @@@
See CASSANDRA-16625 and CASSANDRA-18000 for further details.
-->
<target name="maybe-build-test" unless="no-build-test">
- <antcall target="build-test"/>
+ <antcall target="build-test" inheritRefs="true"/>
</target>
- <target name="build-test" depends="_main-jar,stress-build,fqltool-build,resolver-dist-lib"
- <target name="build-test" depends="jar,stress-build-test" description="Compile test classes">
++ <target name="build-test" depends="_main-jar,stress-build-test,fqltool-build,resolver-dist-lib"
+ description="Compile test classes">
+ <antcall target="_build-test"/>
+ </target>
+
+ <target name="_build-test">
<javac
compiler="modern"
debug="true"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org