# HG changeset patch
# User Stefan Anzinger <stefan.anzinger@oracle.com>
# Date 1431963883 -7200
# Node ID 6df10903c9559c31f7295fe311e7bb660e298b50
# Parent  082417ac43e45c4fcf08978ff97b9902825e588e
Force IPv4 on dacapo tests; see JDK-8072384

diff -r 082417ac43e4 -r 6df10903c955 mx/sanitycheck.py
--- a/mx/sanitycheck.py	Mon May 18 14:55:32 2015 +0200
+++ b/mx/sanitycheck.py	Mon May 18 17:44:43 2015 +0200
@@ -219,7 +219,8 @@
     dacapoMatcher = ValuesMatcher(dacapoTime, {'group' : 'DaCapo', 'name' : '<benchmark>', 'score' : '<time>'})
     dacapoMatcher1 = ValuesMatcher(dacapoTime1, {'group' : 'DaCapo-1stRun', 'name' : '<benchmark>', 'score' : '<time>'})
 
-    return Test("DaCapo-" + name, ['-jar', mx._cygpathU2W(dacapo), name] + _noneAsEmptyList(dacapoArgs), [dacapoSuccess], [dacapoFail], [dacapoMatcher, dacapoMatcher1], ['-Xms2g', '-XX:+' + gc, '-XX:-UseCompressedOops'])
+    # Use ipv4 stack for dacapos; tomcat+solaris+ipv6_interface fails (see also: JDK-8072384)
+    return Test("DaCapo-" + name, ['-jar', mx._cygpathU2W(dacapo), name] + _noneAsEmptyList(dacapoArgs), [dacapoSuccess], [dacapoFail], [dacapoMatcher, dacapoMatcher1], ['-Xms2g', '-XX:+' + gc, '-XX:-UseCompressedOops', "-Djava.net.preferIPv4Stack=false"])
 
 def getScalaDacapos(level=SanityCheckLevel.Normal, gateBuildLevel=None, dacapoArgs=None):
     checks = []