Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authormchung
Wed, 17 Feb 2016 17:47:25 -0800
changeset 36006 560e8db191ec
parent 36005 78962ba72143 (current diff)
parent 36004 91d5f006921d (diff)
child 36007 1d78df8f6a94
Merge
--- a/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java	Wed Feb 17 17:45:12 2016 -0800
+++ b/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java	Wed Feb 17 17:47:25 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @run main/othervm LdapTimeoutTest
  * @bug 7094377 8000487 6176036 7056489
  * @summary Timeout tests for ldap
- * @key intermittent
  */
 
 import java.net.Socket;
--- a/jdk/test/java/lang/ProcessHandle/InfoTest.java	Wed Feb 17 17:45:12 2016 -0800
+++ b/jdk/test/java/lang/ProcessHandle/InfoTest.java	Wed Feb 17 17:47:25 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,6 @@
  * @run testng InfoTest
  * @summary Functions of ProcessHandle.Info
  * @author Roger Riggs
- * @key intermittent
  */
 
 public class InfoTest {
--- a/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java	Wed Feb 17 17:45:12 2016 -0800
+++ b/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java	Wed Feb 17 17:47:25 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
  * @test
  * @bug 8007373
  * @summary jdk7 backward compatibility serialization problem
- * @key intermittent
  */
 
 public class Inet6AddressSerializationTest {
--- a/jdk/test/java/net/SocketPermission/SocketPermissionTest.java	Wed Feb 17 17:45:12 2016 -0800
+++ b/jdk/test/java/net/SocketPermission/SocketPermissionTest.java	Wed Feb 17 17:47:25 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8047031
  * @summary SocketPermission tests for legacy socket types
  * @run testng/othervm SocketPermissionTest
- * @key intermittent
  */
 import java.io.IOException;
 import java.net.DatagramPacket;
--- a/jdk/test/java/util/concurrent/Phaser/Basic.java	Wed Feb 17 17:45:12 2016 -0800
+++ b/jdk/test/java/util/concurrent/Phaser/Basic.java	Wed Feb 17 17:47:25 2016 -0800
@@ -34,7 +34,6 @@
 /*
  * @test
  * @bug 6445158
- * @key intermittent
  * @summary Basic tests for Phaser
  * @author Chris Hegarty
  * @modules java.management
--- a/jdk/test/sun/nio/cs/FindDecoderBugs.java	Wed Feb 17 17:45:12 2016 -0800
+++ b/jdk/test/sun/nio/cs/FindDecoderBugs.java	Wed Feb 17 17:47:25 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @build jdk.testlibrary.*
  * @run main/timeout=1800 FindDecoderBugs
  * @author Martin Buchholz
- * @key intermittent randomness
+ * @key randomness
  */
 
 import java.util.*;
--- a/jdk/test/sun/nio/cs/FindEncoderBugs.java	Wed Feb 17 17:45:12 2016 -0800
+++ b/jdk/test/sun/nio/cs/FindEncoderBugs.java	Wed Feb 17 17:47:25 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @build jdk.testlibrary.*
  * @run main/timeout=1200 FindEncoderBugs
  * @author Martin Buchholz
- * @key randomness intermittent
+ * @key randomness
  */
 
 import java.util.*;
jdk-sandbox