You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2015/05/31 11:21:07 UTC
svn commit: r1682701 - in /zookeeper/trunk: CHANGES.txt build.xml
src/java/test/bin/test-patch.sh
Author: michim
Date: Sun May 31 09:21:07 2015
New Revision: 1682701
URL: http://svn.apache.org/r1682701
Log:
ZOOKEEPER-2198 Set default test.junit.threads to 1 (Chris Nauroth via michim)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/build.xml
zookeeper/trunk/src/java/test/bin/test-patch.sh
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1682701&r1=1682700&r2=1682701&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sun May 31 09:21:07 2015
@@ -163,6 +163,8 @@ IMPROVEMENTS:
ZOOKEEPER-2098: QuorumCnxManager: use BufferedOutputStream for initial msg
(Raul Gutierrez Segales via hdeng)
+ ZOOKEEPER-2198 Set default test.junit.threads to 1 (Chris Nauroth via michim)
+
Release 3.5.0 - 8/4/2014
NEW FEATURES:
Modified: zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/build.xml?rev=1682701&r1=1682700&r2=1682701&view=diff
==============================================================================
--- zookeeper/trunk/build.xml (original)
+++ zookeeper/trunk/build.xml Sun May 31 09:21:07 2015
@@ -84,7 +84,7 @@ xmlns:maven="antlib:org.apache.maven.art
<property name="test.timeout" value="900000" />
<property name="test.junit.output.format" value="plain" />
<property name="test.junit.fork.mode" value="perTest" />
- <property name="test.junit.threads" value="8" />
+ <property name="test.junit.threads" value="1" />
<property name="test.junit.printsummary" value="yes" />
<property name="test.junit.haltonfailure" value="no" />
<property name="config.dir" value="${src.dir}/java/test/config" />
Modified: zookeeper/trunk/src/java/test/bin/test-patch.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/bin/test-patch.sh?rev=1682701&r1=1682700&r2=1682701&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/bin/test-patch.sh (original)
+++ zookeeper/trunk/src/java/test/bin/test-patch.sh Sun May 31 09:21:07 2015
@@ -474,8 +474,8 @@ runCoreTests () {
### Kill any rogue build processes from the last attempt
$PS auxwww | $GREP ZookeeperPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
- echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME test-core"
- $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME test-core
+ echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dtest.junit.threads=8 -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME test-core"
+ $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dtest.junit.threads=8 -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME test-core
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT