Skip to content

Commit

Permalink
8334441: Mark tests in jdk_security_infra group as manual
Browse files Browse the repository at this point in the history
Reviewed-by: clanger
Backport-of: 8e1d2b0
  • Loading branch information
SendaoYan authored and liach committed Jun 23, 2024
1 parent 1dbad80 commit 10d81a3
Show file tree
Hide file tree
Showing 10 changed files with 158 additions and 155 deletions.
2 changes: 0 additions & 2 deletions test/jdk/ProblemList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,6 @@ javax/net/ssl/SSLSession/CertMsgCheck.java 8326705 generic-

sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java 8316183,8333317 generic-all

security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1 8333640 generic-all

############################################################################

# jdk_sound
Expand Down
5 changes: 4 additions & 1 deletion test/jdk/TEST.groups
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ jdk_security = \
:jdk_security3 \
:jdk_security4

# Tests in this group are manual as they depend on external infra
# and may fail with external reasons, for instance - change in CA test portal.
jdk_security_infra = \
security/infra

Expand Down Expand Up @@ -618,6 +620,7 @@ jdk_core_manual_no_input = \
javax/xml/jaxp/datatype/8033980/GregorianCalAndDurSerDataUtil.java

jdk_security_manual_no_input = \
:jdk_security_infra \
com/sun/crypto/provider/Cipher/DES/PerformanceTest.java \
com/sun/crypto/provider/Cipher/AEAD/GCMIncrementByte4.java \
com/sun/crypto/provider/Cipher/AEAD/GCMIncrementDirect4.java \
Expand Down Expand Up @@ -661,4 +664,4 @@ jdk_containers_extended = \

jdk_core_no_security = \
:jdk_core \
-:jdk_security
-:jdk_security

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2024, 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
Expand All @@ -26,8 +26,8 @@
* @bug 8245654 8256895
* @summary Interoperability tests with Certigna Root CAs from Dhimyotis
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=certpath CertignaCA OCSP
* @run main/othervm -Djava.security.debug=certpath CertignaCA CRL
* @run main/othervm/manual -Djava.security.debug=certpath CertignaCA OCSP
* @run main/othervm/manual -Djava.security.debug=certpath CertignaCA CRL
*/
public class CertignaCA {
// Owner: CN=Certigna Services CA, OID.2.5.4.97=NTRFR-48146308100036,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2024, 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
Expand Down Expand Up @@ -27,8 +27,8 @@
* @summary Interoperability tests with "D-Trust Root Class 3 CA 2 2009" and
* "D-Trust Root Class 3 CA 2 EV 2009" CAs
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=certpath DTrustCA OCSP
* @run main/othervm -Djava.security.debug=certpath DTrustCA CRL
* @run main/othervm/manual -Djava.security.debug=certpath DTrustCA OCSP
* @run main/othervm/manual -Djava.security.debug=certpath DTrustCA CRL
*/
public class DTrustCA {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2024, 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
Expand All @@ -26,8 +26,8 @@
* @bug 8318759
* @summary Interoperability tests with Digicert CS Root G5 certificates
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=ocsp,certpath DigicertCSRootG5 OCSP
* @run main/othervm -Djava.security.debug=certpath DigicertCSRootG5 CRL
* @run main/othervm/manual -Djava.security.debug=ocsp,certpath DigicertCSRootG5 OCSP
* @run main/othervm/manual -Djava.security.debug=certpath DigicertCSRootG5 CRL
*/

public class DigicertCSRootG5 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2024, 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
Expand All @@ -26,8 +26,8 @@
* @bug 8319187
* @summary Interoperability tests with eMudhra emSign Root CA G2 CS root
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=certpath EmSignRootG2CA OCSP
* @run main/othervm -Djava.security.debug=certpath EmSignRootG2CA CRL
* @run main/othervm/manual -Djava.security.debug=certpath EmSignRootG2CA OCSP
* @run main/othervm/manual -Djava.security.debug=certpath EmSignRootG2CA CRL
*/

public class EmSignRootG2CA {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2024, 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
Expand All @@ -26,8 +26,8 @@
* @bug 8256421
* @summary Interoperability tests with Harica CAs
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=certpath HaricaCA OCSP
* @run main/othervm -Djava.security.debug=certpath HaricaCA CRL
* @run main/othervm/manual -Djava.security.debug=certpath HaricaCA OCSP
* @run main/othervm/manual -Djava.security.debug=certpath HaricaCA CRL
*/

/*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2024, 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
Expand All @@ -26,8 +26,8 @@
* @bug 8232019 8256895
* @summary Interoperability tests with LuxTrust Global Root 2 CA
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=certpath LuxTrustCA OCSP
* @run main/othervm -Djava.security.debug=certpath LuxTrustCA CRL
* @run main/othervm/manual -Djava.security.debug=certpath LuxTrustCA OCSP
* @run main/othervm/manual -Djava.security.debug=certpath LuxTrustCA CRL
*/

/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* KEYCHAINSTORE-ROOT trust store
* @library /test/lib
* @requires os.family == "mac"
* @run main/othervm HttpsURLConnectionTest https://github.com KeychainStore-Root
* @run main/othervm/manual HttpsURLConnectionTest https://github.com KeychainStore-Root
*/
import java.io.*;
import java.net.*;
Expand Down

1 comment on commit 10d81a3

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.