zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mic...@apache.org
Subject svn commit: r1682702 - in /zookeeper/branches/branch-3.5: CHANGES.txt build.xml src/java/test/bin/test-patch.sh
Date Sun, 31 May 2015 09:22:58 GMT
Author: michim
Date: Sun May 31 09:22:58 2015
New Revision: 1682702

URL: http://svn.apache.org/r1682702
Log:
ZOOKEEPER-2198 Set default test.junit.threads to 1 (Chris Nauroth via michim)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/build.xml
    zookeeper/branches/branch-3.5/src/java/test/bin/test-patch.sh

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1682702&r1=1682701&r2=1682702&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sun May 31 09:22:58 2015
@@ -153,6 +153,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/branches/branch-3.5/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/build.xml?rev=1682702&r1=1682701&r2=1682702&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/build.xml (original)
+++ zookeeper/branches/branch-3.5/build.xml Sun May 31 09:22:58 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/branches/branch-3.5/src/java/test/bin/test-patch.sh
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/bin/test-patch.sh?rev=1682702&r1=1682701&r2=1682702&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/test/bin/test-patch.sh (original)
+++ zookeeper/branches/branch-3.5/src/java/test/bin/test-patch.sh Sun May 31 09:22:58 2015
@@ -475,8 +475,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
 



Mime
View raw message