Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8252000: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdb #350

Closed
wants to merge 7 commits into from

Conversation

@iignatev
Copy link
Member

@iignatev iignatev commented Sep 24, 2020

the patch

  • removes PropertyResolvingWrapper from vmTestbase/nsk/jdb tests
  • updates JdbArgumentHandler to remove " from jdb.option option
  • reformats code

testing:
vmTestbase/nsk/jdb on {macosx,linux,windows}-x64


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8252000: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdb

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/350/head:pull/350
$ git checkout pull/350

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 24, 2020

👋 Welcome back iignatyev! 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.

Loading

@openjdk openjdk bot changed the title 8252000 8252000: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdb Sep 24, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 24, 2020

@iignatev 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 (add|remove) "label" command.

Loading

@iignatev iignatev marked this pull request as ready for review Sep 25, 2020
@openjdk openjdk bot added the rfr label Sep 25, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 25, 2020

Webrevs

Loading

Copy link
Contributor

@shipilev shipilev left a comment

The changes look good, but I think the practice of doing a massive cleanup in "remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdb" PR is misleading. Better to split this in two issues (at least next time)?

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 25, 2020

@iignatev 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 more details.

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

8252000: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdb

Reviewed-by: shade, cjplummer, sspitsyn

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 62 new commits pushed to the master branch:

  • 5310d85: 8252937: Correct "no comment" warnings from javadoc in java.math package
  • 8df3e72: 8218685: jlink --list-plugins needs to be readable and tidy
  • 2fe0a5d: 8253476: TestUseContainerSupport.java fails on some Linux kernels w/o swap limit capabilities
  • fb20690: 8253637: Update EC removal
  • b1ce6bd: 8253548: jvmFlagAccess.cpp: clang 9.0.0 format specifier error
  • ff6843c: 8253714: [cgroups v2] Soft memory limit incorrectly using memory.high
  • d5be829: 8253770: Test tools/javac/parser/JavacParserTest.java fails on Windows after JDK-8253584
  • 6e5d4f3: 8253607: [mlvm] meth/func/jdi/breakpointOtherStratum: un-problemlist and add randomness keyword
  • 3ed960e: 8253640: Make MEMFLAGS an enum class
  • 86491a5: 8253584: Redunant errors for partial member selects
  • ... and 52 more: https://git.openjdk.java.net/jdk/compare/9ac162e896dcb07071c7a2146e8eecbd75115edb...master

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.

Loading

@openjdk openjdk bot added the ready label Sep 25, 2020
@iignatev
Copy link
Member Author

@iignatev iignatev commented Sep 25, 2020

The changes look good, but I think the practice of doing a massive cleanup in "remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdb" PR is misleading. Better to split this in two issues (at least next time)?

o/c I can split, however, given I'm not (yet?) on the crusade to clean up all the code within test/hotspot and just do clean up in the touched files, the title for such an RFE would be somewhat weird and/or misleading, e.g. 'clean up code in the files Igor touched in 8252000', 'some cleans up in some files within vmTestbase/nsk/jdb', etc.

Loading

@iignatev
Copy link
Member Author

@iignatev iignatev commented Sep 25, 2020

@shipilev , the next iteration should have all your comments addressed.

Loading

@iignatev
Copy link
Member Author

@iignatev iignatev commented Sep 29, 2020

@shipilev , do you have any further comments? Or are you (relatively) happy w/ the patch after the last 3 commits?

Loading

@plummercj
Copy link
Contributor

@plummercj plummercj commented Sep 29, 2020

I have to push back on this. Needs to be broken up. You have 3 large changes that are completely unrelated. Seems you can push any of those 3 independent of the others.

Loading

@iignatev
Copy link
Member Author

@iignatev iignatev commented Sep 29, 2020

I have to push back on this. Needs to be broken up. You have 3 large changes that are completely unrelated. Seems you can push any of those 3 independent of the others.

Hi Chris,

what do you see as a 3rd change here?

removes PropertyResolvingWrapper from vmTestbase/nsk/jdb tests and updates JdbArgumentHandler to remove " from jdb.option option parts aren't independent. the only independent part is code reformating, which, at least in my book, would include moving var declaration. so if you insist I can split into two patches: 5f62042 (+ copyright year updates if any) and the rest.

-- Igor

Loading

@plummercj
Copy link
Contributor

@plummercj plummercj commented Sep 29, 2020

what do you see as a 3rd change here?

PropertyResolvingWrapper, format changes, var declaration changes. I think large format changes should be kept separate from other changes, and would preferably be done first.

Loading

iignatev added 2 commits Sep 29, 2020
Revert "updated copyright year"
Revert "move var declarations closer to the 1st use"
Revert "reformat code"

This reverts commits:
 - a092273
 - ba7ce63
 - e793289
 - 2cd3ef1
@iignatev
Copy link
Member Author

@iignatev iignatev commented Sep 29, 2020

what do you see as a 3rd change here?

PropertyResolvingWrapper, format changes, var declaration changes. I think large format changes should be kept separate from other changes, and would preferably be done first.

ok, given we are already in PR to remove PropertyResolvingWrapper, I suggest go w/ it 1st and I'll move other changes into separate RFE/fixes/PRs.

Loading

Copy link
Contributor

@plummercj plummercj left a comment

The changes look good, but can you clarify (preferably in the CR) why the getJdbOptions() changes are needed when removing the use of PropertyResolvingWrapper?

Loading

@sspitsyn
Copy link
Contributor

@sspitsyn sspitsyn commented Sep 30, 2020

Igor, this update looks good to me.

Loading

@iignatev
Copy link
Member Author

@iignatev iignatev commented Sep 30, 2020

Chris, Serguei, thanks for your reviews. I've added the comment[*] explaining the accompanying changes, so should someone need to dig up why these changes were done, they will get some background. please let me know if it needs to be more elaborate.

/integrate

Loading

@openjdk openjdk bot closed this Sep 30, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 30, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 30, 2020

@iignatev Since your change was applied there have been 64 commits pushed to the master branch:

  • a55cde4: 8252002: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdwp
  • ffc97ba: 8253543: sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java failed with "AssertionError: All pixels are not black"
  • 5310d85: 8252937: Correct "no comment" warnings from javadoc in java.math package
  • 8df3e72: 8218685: jlink --list-plugins needs to be readable and tidy
  • 2fe0a5d: 8253476: TestUseContainerSupport.java fails on some Linux kernels w/o swap limit capabilities
  • fb20690: 8253637: Update EC removal
  • b1ce6bd: 8253548: jvmFlagAccess.cpp: clang 9.0.0 format specifier error
  • ff6843c: 8253714: [cgroups v2] Soft memory limit incorrectly using memory.high
  • d5be829: 8253770: Test tools/javac/parser/JavacParserTest.java fails on Windows after JDK-8253584
  • 6e5d4f3: 8253607: [mlvm] meth/func/jdi/breakpointOtherStratum: un-problemlist and add randomness keyword
  • ... and 54 more: https://git.openjdk.java.net/jdk/compare/9ac162e896dcb07071c7a2146e8eecbd75115edb...master

Your commit was automatically rebased without conflicts.

Pushed as commit 1eca634.

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

Loading

@iignatev iignatev deleted the 8252000 branch Sep 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants