natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into cassandra-4.0 

* cassandra-3.11:
  ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
This commit is contained in:
Mick Semb Wever 2022-11-05 15:51:47 +01:00
parent 5e705a8492 f9b2cd6f3f
commit 17e6942775
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.xml
View File

@ -946,7 +946,7 @@
</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>
@ -956,7 +956,7 @@
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}"/>
@ -1269,10 +1269,10 @@
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="_main-jar,stress-build-test,fqltool-build,resolver-dist-lib"
description="Compile test classes">
<antcall target="_build-test"/>
</target>