From 2d281f78c404ea4597818aafb590f2f8d10f955b Mon Sep 17 00:00:00 2001 From: Amy Lu Date: Thu, 18 Feb 2016 09:50:55 +0800 Subject: [PATCH] 8149920: Remove intermittent key from jdk_core tests Reviewed-by: darcy --- jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java | 3 +-- jdk/test/java/lang/ProcessHandle/InfoTest.java | 3 +-- .../Inet6Address/serialize/Inet6AddressSerializationTest.java | 3 +-- jdk/test/java/net/SocketPermission/SocketPermissionTest.java | 3 +-- jdk/test/java/util/concurrent/Phaser/Basic.java | 1 - jdk/test/sun/nio/cs/FindDecoderBugs.java | 4 ++-- jdk/test/sun/nio/cs/FindEncoderBugs.java | 4 ++-- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java b/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java index 5da62ee647e..518dfc8f622 100644 --- a/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java +++ b/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java @@ -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; diff --git a/jdk/test/java/lang/ProcessHandle/InfoTest.java b/jdk/test/java/lang/ProcessHandle/InfoTest.java index bca423b67c3..cfb21d868db 100644 --- a/jdk/test/java/lang/ProcessHandle/InfoTest.java +++ b/jdk/test/java/lang/ProcessHandle/InfoTest.java @@ -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 @@ import org.testng.annotations.Test; * @run testng InfoTest * @summary Functions of ProcessHandle.Info * @author Roger Riggs - * @key intermittent */ public class InfoTest { diff --git a/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java b/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java index b189aa4a147..b72de09db30 100644 --- a/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java +++ b/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java @@ -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 @@ import java.util.List; * @test * @bug 8007373 * @summary jdk7 backward compatibility serialization problem - * @key intermittent */ public class Inet6AddressSerializationTest { diff --git a/jdk/test/java/net/SocketPermission/SocketPermissionTest.java b/jdk/test/java/net/SocketPermission/SocketPermissionTest.java index 1b68415d028..b77b425c93a 100644 --- a/jdk/test/java/net/SocketPermission/SocketPermissionTest.java +++ b/jdk/test/java/net/SocketPermission/SocketPermissionTest.java @@ -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; diff --git a/jdk/test/java/util/concurrent/Phaser/Basic.java b/jdk/test/java/util/concurrent/Phaser/Basic.java index dd6a9e90081..b3acc0bd798 100644 --- a/jdk/test/java/util/concurrent/Phaser/Basic.java +++ b/jdk/test/java/util/concurrent/Phaser/Basic.java @@ -34,7 +34,6 @@ /* * @test * @bug 6445158 - * @key intermittent * @summary Basic tests for Phaser * @author Chris Hegarty * @modules java.management diff --git a/jdk/test/sun/nio/cs/FindDecoderBugs.java b/jdk/test/sun/nio/cs/FindDecoderBugs.java index f4add2a4ca0..f21d7c0de2f 100644 --- a/jdk/test/sun/nio/cs/FindDecoderBugs.java +++ b/jdk/test/sun/nio/cs/FindDecoderBugs.java @@ -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.*; diff --git a/jdk/test/sun/nio/cs/FindEncoderBugs.java b/jdk/test/sun/nio/cs/FindEncoderBugs.java index 19c1621856f..78ef3029522 100644 --- a/jdk/test/sun/nio/cs/FindEncoderBugs.java +++ b/jdk/test/sun/nio/cs/FindEncoderBugs.java @@ -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.*;