diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java index 8b76843b47e..cdb66bdcf8e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2021, 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 @@ -109,24 +109,8 @@ private int runThis (String argv[], PrintStream out) { logHandler = new Log(out, argsHandler); Binder binder = new Binder(argsHandler, logHandler); - - if (argsHandler.verbose()) { - debugee = binder.bindToDebugee(debugeeName + " -vbs"); - } else { - debugee = binder.bindToDebugee(debugeeName); - } - - IOPipe pipe = new IOPipe(debugee); - - - debugee.redirectStderr(out); - debugee.resume(); - - String line = pipe.readln(); - if (!line.equals("ready")) { - logHandler.complain("# Cannot recognize debugee's signal: " + line); - return 2; - }; + debugee = Debugee.prepareDebugee(argsHandler, logHandler, + debugeeName + (argsHandler.verbose() ? " -vbs" : "")); // ReferenceType classes[] = debugee.classes(); // for (int i=0; iIOPipe at debugger side. */ - public static IOPipe startDebuggerPipe(Binder binder) { + public static IOPipe startDebuggerPipe(DebugeeBinder binder) { IOPipe ioPipe = new IOPipe(binder.getLog(), binder.getArgumentHandler().getDebugeeHost(), binder.getArgumentHandler().getPipePortNumber(), @@ -95,7 +95,6 @@ public static IOPipe startDebuggerPipe(Binder binder) { return ioPipe; } - protected void connect() { super.connect(); }