8330534: Update nsk/jdwp tests to use driver instead of othervm by lmesnik · Pull Request #18826 · openjdk/jdk

lmesnik · 2024-04-17T20:19:49Z

The jdwp tests use debugger and debugee. There is no goal to execute debugger part with all VM flags, they are needed to be used with debugee VM only.
The change is all tests is to don't use System.exit() and use 'driver' instead of othervm.
test/hotspot/jtreg/vmTestbase/nsk/share/jpda/DebugeeBinder.java
is updated to correctly set classpath for debugee

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8330534: Update nsk/jdwp tests to use driver instead of othervm (Sub-task - P4)

Reviewers

Serguei Spitsyn (@sspitsyn - Reviewer) ⚠️ Review applies to 122446b6
Chris Plummer (@plummercj - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/18826/head:pull/18826
$ git checkout pull/18826

Update a local copy of the PR:
$ git checkout pull/18826
$ git pull https://git.openjdk.org/jdk.git pull/18826/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18826

View PR using the GUI difftool:
$ git pr show -t 18826

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/18826.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2024-04-17T20:20:51Z

👋 Welcome back lmesnik! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2024-04-17T20:21:28Z

@lmesnik This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8330534: Update nsk/jdwp tests to use driver instead of othervm

Reviewed-by: sspitsyn, cjplummer

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

bbd3b1d: 8334036: Update JCov for class file version 68

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2024-04-17T20:21:55Z

@lmesnik The following label will be automatically applied to this pull request:

serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2024-04-17T20:25:14Z

Webrevs

turbanoff · 2024-04-22T11:20:59Z

...tbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java

-    public static void main(String[] argv) {
-        System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+    public static void main (String argv[]) {
+        int result = run(argv,System.out);


Suggested change

int result = run(argv,System.out);

int result = run(argv, System.out);

turbanoff · 2024-04-22T11:21:15Z

test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Interrupt/interrupt001.java

     */
    public static void main (String argv[]) {
-        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+        int result = run(argv,System.out);


Suggested change

int result = run(argv,System.out);

int result = run(argv, System.out);

Yes, this missing space is all over this fix. Need to fix this formatting.

turbanoff · 2024-04-22T11:21:25Z

test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/Name/name001.java

     */
    public static void main (String argv[]) {
-        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+        int result = run(argv,System.out);


Suggested change

int result = run(argv,System.out);

int result = run(argv, System.out);

turbanoff · 2024-04-22T11:21:33Z

test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/OwnedMonitors/ownmonitors001.java

     */
    public static void main (String argv[]) {
-        System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+        int result = run(argv,System.out);


Suggested change

int result = run(argv,System.out);

int result = run(argv, System.out);

Thanks, I update the indentation in all places.

sspitsyn

This looks okay in general.
There is a missing space in half of files in method run() parameters noticed by Andrei.
Also, Chris had some concerns about converting to the driver mode.

plummercj · 2024-06-11T17:21:09Z

There is something wrong with this diff. The original commit showed a lot of diffs to change main/othervm to driver (the main purpose of this PR), but now I don't see any of those changes and instead for the most part all I see is the very minor change to add a space in the run() call arguments. I think for some reason only your 2nd commit is being applied to this PR and the first commit was lost. However, the loss of the first commit is not showing up in the incremental diff of the two commits. I'm not sure what's going on.

lmesnik · 2024-06-11T18:45:33Z

Thanks! I've updated also 'jdi' tests by this space deletion. Reverted the changes, the PR is clean now. I'll update jdi tests separately.

plummercj

Looks good.

lmesnik · 2024-06-11T21:02:54Z

/integrate

openjdk · 2024-06-11T21:03:22Z

Going to push as commit 56e8e60.
Since your change was applied there has been 1 commit pushed to the master branch:

bbd3b1d: 8334036: Update JCov for class file version 68

Your commit was automatically rebased without conflicts.

openjdk · 2024-06-11T21:03:27Z

@lmesnik Pushed as commit 56e8e60.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

8330534: Update nsk/jdwp tests to use driver instead of othervm

122446b

openjdk bot added the rfr Pull request is ready for review label Apr 17, 2024

openjdk bot added the serviceability serviceability-dev@openjdk.org label Apr 17, 2024

turbanoff reviewed Apr 22, 2024

View reviewed changes

sspitsyn approved these changes May 4, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 4, 2024

identation updated.

efd5a7d

lmesnik added 3 commits June 11, 2024 11:33

jdi cleanup.

842ce51

reverted jdi

58a36cd

Merge branch 'master' of https://github.com/openjdk/jdk into 8330534

c38eb00

plummercj approved these changes Jun 11, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jun 11, 2024

openjdk bot closed this Jun 11, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 11, 2024

	int result = run(argv,System.out);
	int result = run(argv, System.out);

Conversation

lmesnik commented Apr 17, 2024 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Apr 17, 2024

Uh oh!

openjdk bot commented Apr 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Apr 17, 2024

Uh oh!

mlbridge bot commented Apr 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

turbanoff Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

turbanoff Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

sspitsyn May 4, 2024

Choose a reason for hiding this comment

Uh oh!

turbanoff Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

turbanoff Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

lmesnik May 5, 2024

Choose a reason for hiding this comment

Uh oh!

sspitsyn left a comment

Choose a reason for hiding this comment

Uh oh!

plummercj commented Jun 11, 2024

Uh oh!

lmesnik commented Jun 11, 2024

Uh oh!

plummercj left a comment

Choose a reason for hiding this comment

Uh oh!

lmesnik commented Jun 11, 2024

Uh oh!

openjdk bot commented Jun 11, 2024

Uh oh!

openjdk bot commented Jun 11, 2024

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

lmesnik commented Apr 17, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Apr 17, 2024 •

edited

Loading

mlbridge bot commented Apr 17, 2024 •

edited

Loading