Mercurial > hg > openjdk > jdk6 > jdk

changeset 515:af447a0eabba jdk6-b23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author michaelm
date Fri, 01 Jul 2011 11:07:45 +0100
parents 84f59eb687af (current diff) ba4d9105a2e8 (diff)
children 506b35a2f558
files
diffstat 2 files changed, 31 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/Makefile	Fri Jul 01 11:06:47 2011 +0100
+++ b/test/Makefile	Fri Jul 01 11:07:45 2011 +0100
@@ -354,9 +354,10 @@
 ifndef USE_JTREG_SAMEVM
   USE_JTREG_SAMEVM=false
 endif
-# With samevm, you cannot use -javaoptions?
+# With samevm, you cannot use -javaoptions? (-agentvm is more reliable -samevm)
 ifeq ($(USE_JTREG_SAMEVM),true)
-  JTREG_SAMEVM_OPTION = -samevm
+  #JTREG_SAMEVM_OPTION = -samevm
+  JTREG_SAMEVM_OPTION = -agentvm
   EXTRA_JTREG_OPTIONS += $(JTREG_SAMEVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%)
   JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%)
 else
--- a/test/ProblemList.txt	Fri Jul 01 11:06:47 2011 +0100
+++ b/test/ProblemList.txt	Fri Jul 01 11:07:45 2011 +0100
@@ -179,6 +179,9 @@
 # Many of these tests have a tendency to leave input streams open, which
 #  will cause following tests to be failures when used in samevm mode.
 
+# Fails on Windows, not closing a file?: 7059970
+javax/imageio/plugins/png/ITXtTest.java 			generic-all
+
 # Fails on Windows 2000 & 2003/x64
 #   Exception: .\x.SetAccessPermission.dir: setWritable(false, true) Failed
 #	at SetAccess.doTest(SetAccess.java:144)
@@ -586,6 +589,18 @@
 # Suspect many of these tests auffer from using fixed ports, no concrete 
 #   evidence.
 
+# Failing 7060203 SocketException: maximum number of DatagramSockets reached
+java/net/DatagramSocket/BindFailTest.java			windows-all
+java/net/DatagramSocket/ImplicitBind.java			windows-all
+java/net/DatagramSocket/InheritHandle.java			windows-all
+java/net/DatagramSocket/PortUnreachable.java			windows-all
+java/net/DatagramSocket/ReportSocketClosed.java			windows-all
+java/net/DatagramSocket/Send12k.java				windows-all
+java/net/DatagramSocket/SendDatagramToBadAddress.java		windows-all
+java/net/DatagramSocket/SetReceiveBufferSize.java		windows-all
+java/net/DatagramSocketImpl/CheckDiscard.java			windows-all
+java/net/InetAddress/IsReachable.java				windows-all
+
 # Fails on OpenSolaris, see 7032247
 java/net/InetAddress/GetLocalHostWithSM.java			generic-all
 
@@ -746,6 +761,9 @@
 
 # jdk_nio
 
+# Fails on Windows: 7012823
+java/nio/MappedByteBuffer/Force.java				windows-all 
+
 # Fails on OpenSolaris, see 6983794
 java/nio/channels/Selector/ConnectWrite.java			generic-all
 
@@ -935,6 +953,10 @@
 
 # jdk_security
 
+# Lost provider? 7052537: 
+#  java.security.NoSuchAlgorithmException: RSA KeyPairGenerator not available
+java/security/SignedObject/Correctness.java			generic-all
+
 # Fails on OpenSolaris, see 7032257
 sun/security/pkcs11/ec/ReadCertificates.java			generic-all
 sun/security/pkcs11/ec/ReadPKCS12.java				generic-all
@@ -1115,6 +1137,9 @@
 #  So most if not all tools tests are now being run with "othervm" mode.
 #  Some of these tools tests have a tendency to use fixed ports, bad idea.
 
+# Failed 6963102, unreliable testcase
+sun/tools/jstatd/jstatdDefaults.sh				generic-all
+
 # Native allocation errors on windows
 tools/pack200/MemoryAllocatorTest.java				generic-all
 
@@ -1174,6 +1199,9 @@
 
 # jdk_util
 
+# Fails unpredictably: 6633113
+java/util/concurrent/SynchronousQueue/Fairness.java 		generic-all
+
 # Fails on OpenSolaris, see 6876961
 java/util/ResourceBundle/Test4300693.java			generic-all