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 f9b2cd6f3f1bdfa775b6e8bde7e5b22dc6e60d0b
Merge: bdd6606486 30a3266780
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Sat Nov 5 15:50:56 2022 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
build.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --cc build.xml
index c326f7992e,965ff8640d..5e15f4923d
--- a/build.xml
+++ b/build.xml
@@@ -777,27 -749,6 +777,27 @@@
<path refid="cassandra.classpath" />
</classpath>
</javac>
+ <copy todir="${stress.build.classes}">
+ <fileset dir="${stress.build.src}/resources" />
+ </copy>
+ </target>
+
- <target name="stress-test" depends="stress-build-test, maybe-build-test"
description="Runs stress tests">
++ <target name="stress-test" depends="maybe-build-test" description="Runs
stress tests">
+ <testmacro inputdir="${stress.test.src}"
+ timeout="${test.timeout}">
+ </testmacro>
+ </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
+ -->
- <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>
</target>
<target name="_write-poms" depends="maven-declare-dependencies">
@@@ -925,7 -921,15 +925,7 @@@
</target>
<!-- creates release tarballs -->
- <target name="artifacts"
depends="jar,gen-doc,build-test,stress-build-test,sources-jar"
- <target name="artifacts" depends="jar,build-test,sources-jar"
++ <target name="artifacts" depends="jar,gen-doc,build-test,sources-jar"
description="Create Cassandra release artifacts">
<mkdir dir="${dist.dir}"/>
<!-- fix the control linefeed so that builds on windows works on linux
-->
@@@ -1101,12 -1081,11 +1101,12 @@@
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="jar,stress-build" description="Compile
test classes">
++ <target name="build-test" depends="jar,stress-build-test"
description="Compile test classes">
<javac
+ compiler="modern"
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
