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
The following commit(s) were added to refs/heads/trunk by this push: new f038059e89 ninja-fix test*some targets need to pass a relative path to outfile f038059e89 is described below commit f038059e89b089a19c36b3be58a443b0586fef5c Author: Mick Semb Wever <m...@apache.org> AuthorDate: Thu Jul 13 11:42:54 2023 +0200 ninja-fix test*some targets need to pass a relative path to outfile patch by Mick Semb Wever; reviewed by Stefan Miklosovic, Berenguer Blasi, Jacek Lewandowski for CASSANDRA-18133 --- build.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build.xml b/build.xml index 1b204eb1a8..d69e192ae1 100644 --- a/build.xml +++ b/build.xml @@ -590,10 +590,9 @@ ant stress-test-some -Dtest.name=org.apache.cassandra.stress.generate.DistributionGaussianTest -Dtest.methods=simpleGaussian --> <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.dir}/output/TEST-${test.name}-${test.methods}"/> - <test if:blank="${test.methods}" name="${test.name}" outfile="${build.test.dir}/output/TEST-${test.name}"/> + <testmacro inputdir="${stress.test.src}" timeout="${test.timeout}"> + <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}-${test.methods}"/> + <test if:blank="${test.methods}" name="${test.name}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}"/> </testmacro> </target> @@ -1371,8 +1370,8 @@ </and> </condition> <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}"> - <test if="withMethods" name="${test.name}" methods="${test.methods}" outfile="${build.test.dir}/output/TEST-${test.name}-${test.methods}"/> - <test if="withoutMethods" name="${test.name}" outfile="${build.test.dir}/output/TEST-${test.name}"/> + <test if="withMethods" name="${test.name}" methods="${test.methods}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}-${test.methods}"/> + <test if="withoutMethods" name="${test.name}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}"/> <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/> <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/> <jvmarg value="-Dcassandra.ring_delay_ms=1000"/> @@ -1791,8 +1790,8 @@ --> <target name="test-jvm-dtest-some" depends="maybe-build-test" description="Execute some in-jvm dtests"> <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true"> - <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" outfile="${build.test.dir}/output/TEST-${test.name}-${test.methods}"/> - <test if:blank="${test.methods}" name="${test.name}" outfile="${build.test.dir}/output/TEST-${test.name}"/> + <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}-${test.methods}"/> + <test if:blank="${test.methods}" name="${test.name}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}"/> <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/> <jvmarg value="-Dcassandra.ring_delay_ms=10000"/> <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org