From 225d43fd59f190dfcff50f31e2cab6db2a4dd018 Mon Sep 17 00:00:00 2001 From: Jiangli Zhou Date: Wed, 16 Apr 2025 16:29:28 -0700 Subject: [PATCH] Skip testing using JDK libzip.so on static JDK. --- test/jdk/jdk/internal/loader/NativeLibraries/Main.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/jdk/jdk/internal/loader/NativeLibraries/Main.java b/test/jdk/jdk/internal/loader/NativeLibraries/Main.java index 4709810b0cdfb..5d96777a6f192 100644 --- a/test/jdk/jdk/internal/loader/NativeLibraries/Main.java +++ b/test/jdk/jdk/internal/loader/NativeLibraries/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, 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 @@ -24,6 +24,7 @@ /* * @test * @bug 8240975 8281335 + * @library /test/lib * @modules java.base/jdk.internal.loader * @build java.base/* p.Test Main * @run main/othervm/native -Xcheck:jni Main @@ -31,6 +32,7 @@ */ import jdk.internal.loader.NativeLibrariesTest; +import jdk.test.lib.Platform; import java.io.IOException; import java.nio.file.Files; @@ -55,7 +57,9 @@ public static void main(String... args) throws Exception { test.unload(); // load zip library from JDK - test.load(System.mapLibraryName("zip"), true /* succeed */); + if (!Platform.isStatic()) { + test.load(System.mapLibraryName("zip"), true /* succeed */); + } // load non-existent library test.load(System.mapLibraryName("NotExist"), false /* fail to load */);