forked from openjdk/jdk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix provider verification when some JMODs are present
In some configurations, e.g. when java.base is missing from the packaged modules, but another JDK module is present as JMOD that is linked into an image, then provider verification can fail. Thus, the run-time image link fails. Verify that this doesn't happen. The fix is to return Platform.runtime() for run-time image based links as well. Otherwise this code would return the wrong result.
- Loading branch information
Showing
3 changed files
with
202 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
test/jdk/tools/jlink/JmodLess/BasicJlinkMissingJavaBase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* | ||
* Copyright (c) 2024, Red Hat, Inc. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
import java.nio.file.Path; | ||
import java.util.List; | ||
import java.util.Set; | ||
|
||
import tests.Helper; | ||
|
||
|
||
/* | ||
* @test | ||
* @summary Test basic runtime-image-based jlinking with java.base.jmod missing | ||
* but java.xml.jmod present. It should use a run-time image based link. | ||
* @requires (jlink.packagedModules & jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g) | ||
* @library ../../lib /test/lib | ||
* @enablePreview | ||
* @modules java.base/jdk.internal.jimage | ||
* jdk.jlink/jdk.tools.jlink.internal | ||
* jdk.jlink/jdk.tools.jlink.plugin | ||
* jdk.jlink/jdk.tools.jimage | ||
* @build tests.* jdk.test.lib.process.OutputAnalyzer | ||
* jdk.test.lib.process.ProcessTools | ||
* @run main/othervm -Xmx1g BasicJlinkMissingJavaBase | ||
*/ | ||
public class BasicJlinkMissingJavaBase extends AbstractLinkableRuntimeTest { | ||
|
||
@Override | ||
public void runTest(Helper helper) throws Exception { | ||
Path finalImage = createJavaXMLRuntimeLink(helper, "java-xml"); | ||
verifyListModules(finalImage, List.of("java.base", "java.xml")); | ||
} | ||
|
||
private Path createJavaXMLRuntimeLink(Helper helper, String name) throws Exception { | ||
BaseJlinkSpecBuilder builder = new BaseJlinkSpecBuilder(); | ||
builder.helper(helper) | ||
.name(name) | ||
.addModule("java.xml") | ||
.validatingModule("java.xml"); | ||
Set<String> excludedJmods = Set.of("java.base.jmod"); | ||
return createJavaImageRuntimeLink(builder.build(), excludedJmods); | ||
} | ||
|
||
public static void main(String[] args) throws Exception { | ||
BasicJlinkMissingJavaBase test = new BasicJlinkMissingJavaBase(); | ||
test.run(); | ||
} | ||
|
||
} |