Author: markt Date: Wed Nov 4 00:56:53 2015 New Revision: 1712451 URL: http://svn.apache.org/viewvc?rev=1712451&view=rev Log: Add an option the build to set java.net.preferIPv4Stack=true when running tests. This appears to be required on OSX El Capitan for multicast to work with the current tests
Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/build.xml Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1712451&r1=1712450&r2=1712451&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Wed Nov 4 00:56:53 2015 @@ -44,6 +44,10 @@ test.accesslog=false # Note the Cobertura code coverage tool is GPLv2 licensed test.cobertura=false +# Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the +# multicast tests to work +#java.net.preferIPv4Stack=true + # Location of Java7 JDK #java.7.home=/path/to/java7/jdk Modified: tomcat/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1712451&r1=1712450&r2=1712451&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Wed Nov 4 00:56:53 2015 @@ -1427,6 +1427,7 @@ <jvmarg value="${test.jvmarg.egd}"/> <jvmarg value="-Djava.library.path=${test.apr.loc}"/> <jvmarg value="${test.formatter}"/> + <jvmarg value="-Djava.net.preferIPv4Stack=${java.net.preferIPv4Stack}"/> <jvmarg value="-Dapple.awt.UIElement=true"/> <classpath refid="tomcat.test.run.classpath" /> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org