Skip to content

Commit 1f45797

Browse files
committed
8347124: Clean tests with --enable-linkable-runtime
Reviewed-by: shade, alanb
1 parent 5e92a4c commit 1f45797

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

test/jdk/jdk/jfr/jvm/TestModularImage.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,12 @@
4343
* as expected
4444
* @requires vm.hasJFR
4545
* @library /test/lib
46-
* @run driver jdk.jfr.jvm.TestModularImage
46+
* @comment Test is being run in othervm to support JEP 493 enabled
47+
* JDKs which don't allow patched modules. Note that jtreg patches
48+
* module java.base to add java.lang.JTRegModuleHelper. If then a
49+
* jlink run is attempted in-process - using the ToolProvider API -
50+
* on a JEP 493 enabled JDK, the test fails.
51+
* @run main/othervm jdk.jfr.jvm.TestModularImage
4752
*/
4853
public class TestModularImage {
4954
private static final String STARTED_RECORDING = "Started recording";

test/jdk/tools/launcher/SourceMode.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,12 @@
2626
* @bug 8192920 8204588 8210275 8286571
2727
* @summary Test source mode
2828
* @modules jdk.compiler jdk.jlink
29-
* @run main SourceMode
29+
* @comment Test is being run in othervm to support JEP 493 enabled
30+
* JDKs which don't allow patched modules. Note that jtreg patches
31+
* module java.base to add java.lang.JTRegModuleHelper. If then a
32+
* jlink run is attempted in-process - using the ToolProvider API -
33+
* on a JEP 493 enabled JDK, the test fails.
34+
* @run main/othervm SourceMode
3035
*/
3136

3237

0 commit comments

Comments
 (0)