From 842d6329cf5a3da8df7eddb195b5fcb7baadbdc3 Mon Sep 17 00:00:00 2001 From: Jaikiran Pai Date: Fri, 21 Jul 2023 12:58:20 +0000 Subject: [PATCH] 8227229: Deprecate the launcher -Xdebug/-debug flags that have not done anything since Java 6 Reviewed-by: alanb, cjplummer, dholmes --- make/ide/netbeans/langtools/build.xml | 2 +- src/hotspot/share/runtime/arguments.cpp | 4 +--- src/hotspot/share/runtime/arguments.hpp | 5 ----- .../classes/sun/launcher/resources/launcher.properties | 2 +- src/java.base/share/man/java.1 | 3 +-- src/java.base/share/native/libjli/java.c | 2 +- .../classes/com/sun/tools/jdi/SunCommandLineLauncher.java | 1 - .../hotspot/jtreg/runtime/6294277/SourceDebugExtension.java | 6 +++--- .../nsk/jdi/AttachingConnector/attach/attach001.java | 2 +- .../nsk/jdi/AttachingConnector/attach/attach002.java | 2 +- .../attachnosuspend/attachnosuspend001.java | 2 +- .../nsk/jdi/LaunchingConnector/launch/launch003.java | 2 +- .../nsk/jdi/LaunchingConnector/launch/launch004.java | 2 +- .../nsk/jdi/ListeningConnector/accept/accept001.java | 2 +- .../nsk/jdi/ListeningConnector/accept/accept002.java | 2 +- .../listennosuspend/listennosuspend001.java | 2 +- .../jdi/ListeningConnector/startListening/startlis001.java | 2 +- .../jdi/ListeningConnector/startListening/startlis002.java | 2 +- .../createVirtualMachine/createVM002.java | 4 ++-- .../createVirtualMachine/createVM003.java | 4 ++-- .../createVirtualMachine/createVM004.java | 4 ++-- .../createVirtualMachine/createVM005.java | 4 ++-- .../com/sun/jdi/connect/spi/SimpleLaunchingConnector.java | 4 ++-- .../awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java | 4 ++-- .../DragUnicodeBetweenJVMTest.java | 4 ++-- 25 files changed, 32 insertions(+), 41 deletions(-) diff --git a/make/ide/netbeans/langtools/build.xml b/make/ide/netbeans/langtools/build.xml index 16e1a129e98..f417b256eb6 100644 --- a/make/ide/netbeans/langtools/build.xml +++ b/make/ide/netbeans/langtools/build.xml @@ -242,7 +242,7 @@ diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index 1e60b7eac60..bce581ab70d 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -86,7 +86,6 @@ char* Arguments::_java_command = nullptr; SystemProperty* Arguments::_system_properties = nullptr; size_t Arguments::_conservative_max_heap_alignment = 0; Arguments::Mode Arguments::_mode = _mixed; -bool Arguments::_xdebug_mode = false; const char* Arguments::_java_vendor_url_bug = nullptr; const char* Arguments::_sun_java_launcher = DEFAULT_JAVA_LAUNCHER; bool Arguments::_sun_java_launcher_is_altjvm = false; @@ -2655,8 +2654,7 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m } // -Xdebug } else if (match_option(option, "-Xdebug")) { - // note this flag has been used, then ignore - set_xdebug_mode(true); + warning("Option -Xdebug was deprecated in JDK 22 and will likely be removed in a future release."); // -Xnoagent } else if (match_option(option, "-Xnoagent")) { warning("Option -Xnoagent was deprecated in JDK 22 and will likely be removed in a future release."); diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp index 61f5ef25560..dcc5e9e4e70 100644 --- a/src/hotspot/share/runtime/arguments.hpp +++ b/src/hotspot/share/runtime/arguments.hpp @@ -250,11 +250,6 @@ class Arguments : AllStatic { static Mode _mode; static void set_mode_flags(Mode mode); - // -Xdebug flag - static bool _xdebug_mode; - static void set_xdebug_mode(bool arg) { _xdebug_mode = arg; } - static bool xdebug_mode() { return _xdebug_mode; } - // preview features static bool _enable_preview; diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/src/java.base/share/classes/sun/launcher/resources/launcher.properties index 7d10527b2a8..51b7e4981c0 100644 --- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties +++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties @@ -134,7 +134,7 @@ java.launcher.X.usage=\n\ \ append to end of bootstrap class path\n\ \ -Xcheck:jni perform additional checks for JNI functions\n\ \ -Xcomp forces compilation of methods on first invocation\n\ -\ -Xdebug does nothing. Provided for backward compatibility.\n\ +\ -Xdebug does nothing; deprecated for removal in a future release.\n\ \ -Xdiag show additional diagnostic messages\n\ \ -Xfuture enable strictest checks, anticipating future default.\n\ \ This option is deprecated and may be removed in a\n\ diff --git a/src/java.base/share/man/java.1 b/src/java.base/share/man/java.1 index acc5fa8e4d0..7e00d3d57e7 100644 --- a/src/java.base/share/man/java.1 +++ b/src/java.base/share/man/java.1 @@ -838,8 +838,7 @@ Testing mode to exercise JIT compilers. This option should not be used in production environments. .TP \f[V]-Xdebug\f[R] -Does nothing. -Provided for backward compatibility. +Does nothing; deprecated for removal in a future release. .TP \f[V]-Xdiag\f[R] Shows additional diagnostic messages. diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c index 3b4a15bac5b..ce99c181dee 100644 --- a/src/java.base/share/native/libjli/java.c +++ b/src/java.base/share/native/libjli/java.c @@ -1390,7 +1390,7 @@ ParseArguments(int *pargc, char ***pargv, } else if (JLI_StrCmp(arg, "-tm") == 0) { AddOption("-Xtm", NULL); } else if (JLI_StrCmp(arg, "-debug") == 0) { - AddOption("-Xdebug", NULL); + JLI_ReportErrorMessage(ARG_DEPRECATED, "-debug"); } else if (JLI_StrCmp(arg, "-noclassgc") == 0) { AddOption("-Xnoclassgc", NULL); } else if (JLI_StrCmp(arg, "-Xfuture") == 0) { diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java index 8049f3b9a5a..26393537dc4 100644 --- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java +++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java @@ -225,7 +225,6 @@ public class SunCommandLineLauncher extends AbstractLauncher { String command = exePath + ' ' + options + ' ' + - "-Xdebug " + "-Xrunjdwp:" + xrun + ' ' + mainClassAndArgs; diff --git a/test/hotspot/jtreg/runtime/6294277/SourceDebugExtension.java b/test/hotspot/jtreg/runtime/6294277/SourceDebugExtension.java index 9b86c86cee2..f7dc35af9ab 100644 --- a/test/hotspot/jtreg/runtime/6294277/SourceDebugExtension.java +++ b/test/hotspot/jtreg/runtime/6294277/SourceDebugExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2023, 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 @@ -25,8 +25,8 @@ * @test * @bug 6294277 * @requires vm.jvmti - * @summary java -Xdebug crashes on SourceDebugExtension attribute larger than 64K - * @run main/othervm -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n SourceDebugExtension + * @summary verify that the JVM doesn't crash when SourceDebugExtension attribute is larger than 64K + * @run main/othervm -Xrunjdwp:transport=dt_socket,server=y,suspend=n SourceDebugExtension */ import java.io.*; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java index e8eaf772695..b4ba572147f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java @@ -97,7 +97,7 @@ public class attach001 { String java = argHandler.getLaunchExecPath() + " " + argHandler.getLaunchOptions(); String cmd = java - + " -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=0" + + " -Xrunjdwp:transport=dt_socket,server=y,address=0" + " " + DEBUGEE_CLASS; Binder binder = new Binder(argHandler, log); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java index d62659a9dfb..56c68e64b16 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java @@ -102,7 +102,7 @@ public class attach002 extends Log { String java = argHandler.getLaunchExecPath() + " " + argHandler.getLaunchOptions(); String cmd = java + - " -Xdebug -Xrunjdwp:transport=dt_shmem,server=y,address=" + + " -Xrunjdwp:transport=dt_shmem,server=y,address=" + name + " " + DEBUGEE_CLASS; Binder binder = new Binder(argHandler, log); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java index 6ba44eb9b42..a3e68fe4c9b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java @@ -97,7 +97,7 @@ public class attachnosuspend001 { String java = argHandler.getLaunchExecPath() + " " + argHandler.getLaunchOptions(); String cmd = java - + " -Xdebug -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0" + + " -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0" + " " + DEBUGEE_CLASS; Binder binder = new Binder(argHandler, log); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java index aeb21e4b4a7..2cc3fa73806 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java @@ -134,7 +134,7 @@ public class launch003 { Connector.Argument a = (Connector.Argument) cava[i]; if (a.name().equals("command")) a.setValue(java + - " -Xdebug -Xrunjdwp:suspend=y,transport=" + + " -Xrunjdwp:suspend=y,transport=" + TRANSPORT_NAME + ",address=" + host + ":" + port + " " + DEBUGEE_CLASS); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java index 3febb3b9733..f4b57109c10 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java @@ -133,7 +133,7 @@ public class launch004 { Connector.Argument a = (Connector.Argument) cava[i]; if (a.name().equals("command")) a.setValue(java + - " -Xdebug -Xrunjdwp:suspend=y,transport=" + + " -Xrunjdwp:suspend=y,transport=" + TRANSPORT_NAME + ",address=" + name + " " + DEBUGEE_CLASS); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java index c38279031b8..3d700abbf62 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java @@ -81,7 +81,7 @@ public class accept001 { String java = argHandler.getLaunchExecPath() + " " + argHandler.getLaunchOptions(); String cmd = java + - " -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=" + + " -Xrunjdwp:transport=dt_socket,server=n,address=" + connAddr + " " + DEBUGEE_CLASS; Binder binder = new Binder(argHandler, log); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java index 1e80e07ae74..a3bbf3f8c94 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java @@ -82,7 +82,7 @@ public class accept002 { String java = argHandler.getLaunchExecPath() + " " + argHandler.getLaunchOptions(); String cmd = java + - " -Xdebug -Xrunjdwp:transport=dt_shmem,server=n,address=" + + " -Xrunjdwp:transport=dt_shmem,server=n,address=" + connAddr + " " + DEBUGEE_CLASS; Binder binder = new Binder(argHandler, log); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java index 3ea73669bc9..fc381e86c1d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java @@ -81,7 +81,7 @@ public class listennosuspend001 { String java = argHandler.getLaunchExecPath() + " " + argHandler.getLaunchOptions(); String cmd = java + - " -Xdebug -Xrunjdwp:transport=dt_socket,server=n,suspend=n,address=" + + " -Xrunjdwp:transport=dt_socket,server=n,suspend=n,address=" + connAddr + " " + DEBUGEE_CLASS; Binder binder = new Binder(argHandler, log); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java index 5e736560fc5..43e3b9fa700 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java @@ -157,7 +157,7 @@ public class startlis001 { + " " + argHandler.getLaunchOptions(); String cmd = java + - " -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=" + + " -Xrunjdwp:transport=dt_socket,server=n,address=" + addr + " " + DEBUGEE_CLASS; Binder binder = new Binder(argHandler, log); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java index 7abdfb0156b..262d628e20b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java @@ -132,7 +132,7 @@ public class startlis002 { + " " + argHandler.getLaunchOptions(); String cmd = java + - " -Xdebug -Xrunjdwp:transport=dt_shmem,server=n,address=" + + " -Xrunjdwp:transport=dt_shmem,server=n,address=" + addr + " " + DEBUGEE_CLASS; Binder binder = new Binder(argHandler, log); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java index e49fc7460cf..efe4f6fac92 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2023, 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 @@ -131,7 +131,7 @@ public class createVM002 { String targetJava = argsHandler.getLaunchExecPath() + " " + argsHandler.getLaunchOptions(); - String commandToRun = targetJava + " -Xdebug -Xrunjdwp:transport=dt_socket,address=" + + String commandToRun = targetJava + " -Xrunjdwp:transport=dt_socket,address=" + testTransportServiceListenKey.address() + // Addind "suspend=n' option helps avoid debugee hang. See 6803636. ",suspend=n" + diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java index 92bed251e41..5df26b6ab37 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2023, 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 @@ -136,7 +136,7 @@ public class createVM003 { String targetJava = argsHandler.getLaunchExecPath() + " " + argsHandler.getLaunchOptions(); - String commandToRun = targetJava + " -Xdebug -Xrunjdwp:transport=dt_socket,address=" + + String commandToRun = targetJava + " -Xrunjdwp:transport=dt_socket,address=" + testTransportServiceListenKey.address() + " " + targetVMClassName; Binder binder = new Binder(argsHandler, logHandler); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java index 4a485e21d21..4673ad23fcc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2023, 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 @@ -139,7 +139,7 @@ public class createVM004 { String targetJava = argsHandler.getLaunchExecPath() + " " + argsHandler.getLaunchOptions(); - String commandToRun = targetJava + " -Xdebug -Xrunjdwp:transport=dt_socket,address=" + + String commandToRun = targetJava + " -Xrunjdwp:transport=dt_socket,address=" + testTransportServiceListenKey.address() + " " + targetVMClassName; Binder binder = new Binder(argsHandler, logHandler); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java index 2b47fede424..e7a4e15f93c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2023, 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 @@ -135,7 +135,7 @@ public class createVM005 { String targetJava = argsHandler.getLaunchExecPath() + " " + argsHandler.getLaunchOptions(); - String commandToRun = targetJava + " -Xdebug -Xrunjdwp:transport=dt_socket,address=" + + String commandToRun = targetJava + " -Xrunjdwp:transport=dt_socket,address=" + testTransportServiceListenKey.address() + " " + targetVMClassName; Binder binder = new Binder(argsHandler, logHandler); diff --git a/test/jdk/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java b/test/jdk/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java index 5d23b9f1287..7970a4d63db 100644 --- a/test/jdk/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java +++ b/test/jdk/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2023, 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 @@ -144,7 +144,7 @@ public class SimpleLaunchingConnector implements LaunchingConnector { String exe = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java"; - String cmd = exe + " -Xdebug -Xrunjdwp:transport=dt_socket,timeout=15000,address=" + + String cmd = exe + " -Xrunjdwp:transport=dt_socket,timeout=15000,address=" + key.address() + " -classpath " + System.getProperty("test.classes") + " " + className; diff --git a/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java b/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java index 6df01cca1c9..f20ceec0ec0 100644 --- a/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java +++ b/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2023, 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 @@ -90,7 +90,7 @@ public class HTMLTransferTest { String javaPath = System.getProperty("java.home", ""); String cmd = javaPath + File.separator + "bin" + File.separator + "java -cp " + System.getProperty("test.classes", ".") + - //+ "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 " + //+ "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 " " THTMLConsumer" //+ stFormats ; diff --git a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java index a61493b6a58..18159dce64f 100644 --- a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java +++ b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2023, 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 @@ -79,7 +79,7 @@ public class DragUnicodeBetweenJVMTest { ProcessResults processResults = - // ProcessCommunicator.executeChildProcess(this.getClass()," -cp \"C:\\Documents and Settings\\df153228\\IdeaProjects\\UnicodeTestDebug\\out\\production\\UnicodeTestDebug\" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 ", args); + // ProcessCommunicator.executeChildProcess(this.getClass()," -cp \"C:\\Documents and Settings\\df153228\\IdeaProjects\\UnicodeTestDebug\\out\\production\\UnicodeTestDebug\" -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 ", args); ProcessCommunicator.executeChildProcess(this.getClass(), args); verifyTestResults(processResults);