Skip to content

Commit

Permalink
8314824: Fix serviceability/jvmti/8036666/GetObjectLockCount.java to …
Browse files Browse the repository at this point in the history 
…use vm flags

Reviewed-by: sspitsyn, kevinw
  • Loading branch information
@lmesnik
lmesnik committed Aug 30, 2023
1 parent 7daae1f commit 93e82c0
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions test/hotspot/jtreg/serviceability/jvmti/8036666/GetObjectLockCount.java
View file
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2014 SAP SE. All rights reserved.
* Copyright (c) 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
Expand Down Expand Up @@ -56,12 +57,14 @@
import com.sun.jdi.request.ClassPrepareRequest;
import com.sun.jdi.request.EventRequestManager;

import jdk.test.lib.Utils;

/*
* @test GetObjectLockCount.java
* @bug 8036666
* @summary verify jvm returns correct lock recursion count
* @requires vm.jvmti
* @library /test/lib
* @run compile -g RecursiveObjectLock.java
* @run main/othervm GetObjectLockCount
* @author axel.siebenborn@sap.com
Expand All @@ -71,8 +74,6 @@ public class GetObjectLockCount {

public static final String CLASS_NAME = "RecursiveObjectLock";
public static final String METHOD_NAME = "breakpoint1";
public static final String ARGUMENTS = "";


/**
* Find a com.sun.jdi.CommandLineLaunch connector
Expand Down Expand Up @@ -119,7 +120,7 @@ static Map <String,Connector.Argument> connectorArguments(LaunchingConnector con
if (optionsArg == null) {
throw new Error("Bad launching connector");
}
optionsArg.setValue(ARGUMENTS);
optionsArg.setValue(String.join(" ", Utils.getTestJavaOpts()));
return arguments;
}

Expand Down

3 comments on commit 93e82c0

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 93e82c0 Mar 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 93e82c0 Mar 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch backport-GoeLin-93e82c01 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 93e82c01 from the openjdk/jdk repository.

The commit being backported was authored by Leonid Mesnik on 30 Aug 2023 and was reviewed by Serguei Spitsyn and Kevin Walls.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-93e82c01:backport-GoeLin-93e82c01
$ git checkout backport-GoeLin-93e82c01
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-93e82c01

Please sign in to comment.