Skip to content

Commit

Permalink
8347124: Clean tests with --enable-linkable-runtime
Browse files Browse the repository at this point in the history
Backport-of: 1f45797
  • Loading branch information
jerboaa committed Jan 16, 2025
1 parent 9c91ef4 commit c2087ed
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
9 changes: 7 additions & 2 deletions test/jdk/jdk/jfr/jvm/TestModularImage.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 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
Expand Down Expand Up @@ -43,7 +43,12 @@
* as expected
* @requires vm.hasJFR
* @library /test/lib
* @run driver jdk.jfr.jvm.TestModularImage
* @comment Test is being run in othervm to support JEP 493 enabled
* JDKs which don't allow patched modules. Note that jtreg patches
* module java.base to add java.lang.JTRegModuleHelper. If then a
* jlink run is attempted in-process - using the ToolProvider API -
* on a JEP 493 enabled JDK, the test fails.
* @run main/othervm jdk.jfr.jvm.TestModularImage
*/
public class TestModularImage {
private static final String STARTED_RECORDING = "Started recording";
Expand Down
9 changes: 7 additions & 2 deletions test/jdk/tools/launcher/SourceMode.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 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
Expand All @@ -26,7 +26,12 @@
* @bug 8192920 8204588 8210275 8286571
* @summary Test source mode
* @modules jdk.compiler jdk.jlink
* @run main SourceMode
* @comment Test is being run in othervm to support JEP 493 enabled
* JDKs which don't allow patched modules. Note that jtreg patches
* module java.base to add java.lang.JTRegModuleHelper. If then a
* jlink run is attempted in-process - using the ToolProvider API -
* on a JEP 493 enabled JDK, the test fails.
* @run main/othervm SourceMode
*/


Expand Down

0 comments on commit c2087ed

Please sign in to comment.