# HG changeset patch
# User amlu
# Date 1455759967 -28800
# Node ID 6519aa869709ee371fef253936196056dda24e1b
# Parent  37ba04dea5e7e1e2fbbfba50a4ade9514be7bedb
8149922: Remove intermittent key from security tests
8150047: Remove SSLSession/SessionCacheSizeTests from ProblemList
Reviewed-by: xuelei

diff -r 37ba04dea5e7 -r 6519aa869709 jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt	Wed Feb 17 12:47:35 2016 -0800
+++ b/jdk/test/ProblemList.txt	Thu Feb 18 09:46:07 2016 +0800
@@ -308,9 +308,6 @@
 # 8074580
 sun/security/pkcs11/rsa/TestKeyPairGenerator.java               generic-all
 
-# 8146387
-javax/net/ssl/SSLSession/SessionCacheSizeTests.java windows-all,solaris-all
-
 ############################################################################
 
 # jdk_sound
diff -r 37ba04dea5e7 -r 6519aa869709 jdk/test/javax/net/ssl/SSLSession/SessionCacheSizeTests.java
--- a/jdk/test/javax/net/ssl/SSLSession/SessionCacheSizeTests.java	Wed Feb 17 12:47:35 2016 -0800
+++ b/jdk/test/javax/net/ssl/SSLSession/SessionCacheSizeTests.java	Thu Feb 18 09:46:07 2016 +0800
@@ -31,7 +31,6 @@
  * @bug 4366807
  * @summary Need new APIs to get/set session timeout and session cache size.
  * @run main/othervm SessionCacheSizeTests
- * @key intermittent
  */
 
 import java.io.*;
diff -r 37ba04dea5e7 -r 6519aa869709 jdk/test/sun/security/mscapi/ShortRSAKey1024.sh
--- a/jdk/test/sun/security/mscapi/ShortRSAKey1024.sh	Wed Feb 17 12:47:35 2016 -0800
+++ b/jdk/test/sun/security/mscapi/ShortRSAKey1024.sh	Thu Feb 18 09:46:07 2016 +0800
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -31,7 +31,6 @@
 # @run shell ShortRSAKey1024.sh 1024
 # @run shell ShortRSAKey1024.sh 768
 # @run shell ShortRSAKey1024.sh 512
-# @key intermittent
 
 # set a few environment variables so that the shell-script can run stand-alone
 # in the source directory
diff -r 37ba04dea5e7 -r 6519aa869709 jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh
--- a/jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh	Wed Feb 17 12:47:35 2016 -0800
+++ b/jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh	Thu Feb 18 09:46:07 2016 +0800
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2011, 2015, 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
@@ -29,7 +29,6 @@
 # @requires os.family == "windows"
 # @run shell SignUsingSHA2withRSA.sh
 # @summary Support SHA256 (and higher) in SunMSCAPI
-# @key intermittent
 
 # set a few environment variables so that the shell-script can run stand-alone
 # in the source directory