Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b6fd54a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b6fd54a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b6fd54a Branch: refs/heads/cassandra-3.11 Commit: 9b6fd54a4e3f90c468b4c36a5ad3b88239094681 Parents: 830b012 a3498d5 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Aug 18 19:16:56 2017 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Aug 18 19:16:56 2017 +0200 ---------------------------------------------------------------------- build.xml | 4 +++- circle.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6fd54a/build.xml ---------------------------------------------------------------------- diff --cc build.xml index ea71e6e,e5ab405..38c7d24 --- a/build.xml +++ b/build.xml @@@ -1275,11 -1164,11 +1275,13 @@@ classpath which only contains what we expect users to need. --> <target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar"> + <mkdir dir="${build.test.dir}/output"/> <junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}"> + <!-- Note that the test pass without that next line, but it prints an ugly error message --> + <jvmarg value="-Djava.library.path=${build.lib}/sigar-bin"/> - <test name="org.apache.cassandra.serializers.ClientUtilsTest" /> + <test name="org.apache.cassandra.serializers.ClientUtilsTest" todir="${build.test.dir}/output"/> <formatter type="brief" usefile="false" /> + <formatter type="xml" usefile="true"/> <classpath> <pathelement location="${test.classes}" /> <pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar" /> http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6fd54a/circle.yml ---------------------------------------------------------------------- diff --cc circle.yml index 5b4c72d,f4db279..a6a8b98 --- a/circle.yml +++ b/circle.yml @@@ -7,7 -7,7 +7,7 @@@ test - sudo apt-get update; sudo apt-get install wamerican: parallel: true override: - - case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test ;; 1) ant long-test ;; 2) ant test-compression ;;esac: - - case $CIRCLE_NODE_INDEX in 0) ant test ;; 1) ant long-test ;; 2) ant test-compression ;; 3) ant test-clientutil-jar ;;esac: ++ - case $CIRCLE_NODE_INDEX in 0) ant test ;; 1) ant long-test ;; 2) ant test-compression ;; 3) ant eclipse-warnings ;;esac: parallel: true post: --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org