From 23114c18a298e64caf7aedcc4d5965b283a74606 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Thu, 5 Dec 2024 12:31:43 +0100 Subject: [PATCH] Adjust JLinkOptionsTest.java after JEP 493 --- test/jdk/tools/jpackage/share/JLinkOptionsTest.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/jdk/tools/jpackage/share/JLinkOptionsTest.java b/test/jdk/tools/jpackage/share/JLinkOptionsTest.java index d4f7bca2ae42c..08d336ecf696e 100644 --- a/test/jdk/tools/jpackage/share/JLinkOptionsTest.java +++ b/test/jdk/tools/jpackage/share/JLinkOptionsTest.java @@ -58,24 +58,26 @@ public static Collection input() { "--jlink-options", "--strip-debug --no-man-pages --no-header-files", "--jlink-options", - "--bind-services", + "--verbose --bind-services --limit-modules java.smartcardio,jdk.crypto.cryptoki,java.desktop", }, - // with bind-services should have some services + // with limit-modules and bind-services should have them in the result new String[]{"java.smartcardio", "jdk.crypto.cryptoki"}, null, }, // bind-services {"Hello", new String[]{ - "--jlink-options", "--bind-services", + "--jlink-options", + "--bind-services --limit-modules jdk.jartool,jdk.unsupported,java.desktop", }, - // non modular should have everything + // non modular should have at least the module limits new String[]{"jdk.jartool", "jdk.unsupported"}, null, }, // jlink-options --bind-services {"com.other/com.other.Hello", new String[]{ - "--jlink-options", "--bind-services", + "--jlink-options", + "--bind-services --limit-modules java.smartcardio,jdk.crypto.cryptoki,java.desktop", }, // with bind-services should have some services new String[]{"java.smartcardio", "jdk.crypto.cryptoki"},