From a199ebc0175f9882f051551cff9ce08016f204a4 Mon Sep 17 00:00:00 2001 From: Abdul Kolarkunnu Date: Tue, 17 Aug 2021 16:54:32 +0000 Subject: [PATCH] 8272581: sun/security/pkcs11/Provider/MultipleLogins.sh fails after JDK-8266182 Reviewed-by: weijun --- test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java | 4 ++-- .../lib/{artifacts => security}/OpensslArtifactFetcher.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename test/lib/jdk/test/lib/{artifacts => security}/OpensslArtifactFetcher.java (99%) diff --git a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java index d4efcc001a9..da655c90a49 100644 --- a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java +++ b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java @@ -44,7 +44,7 @@ import jdk.test.lib.Asserts; import jdk.test.lib.SecurityTools; import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.OutputAnalyzer; -import jdk.test.lib.artifacts.OpensslArtifactFetcher; +import jdk.test.lib.security.OpensslArtifactFetcher; import java.io.File; import java.io.FileInputStream; @@ -581,4 +581,4 @@ public class KeytoolOpensslInteropTest { private static OutputAnalyzer keytool(String s) throws Throwable { return SecurityTools.keytool(s); } -} \ No newline at end of file +} diff --git a/test/lib/jdk/test/lib/artifacts/OpensslArtifactFetcher.java b/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java similarity index 99% rename from test/lib/jdk/test/lib/artifacts/OpensslArtifactFetcher.java rename to test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java index 8b320c027a5..d70f187301e 100644 --- a/test/lib/jdk/test/lib/artifacts/OpensslArtifactFetcher.java +++ b/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java @@ -21,7 +21,7 @@ * questions. */ -package jdk.test.lib.artifacts; +package jdk.test.lib.security; import java.io.File;