8252001: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdi #379

iignatev · 2020-09-28T14:09:59Z

Hi all,

could you please review the patch which removes PropertyResolvingWrapper from vmTestbase/nsk/jdi? other than the removal of PropertyResolvingWrapper from jtreg actions, the patch also

s/"-debugee.vmkeys=/-debugee.vmkeys="/
removed ExecDriver there it's not needed anymore
as jtreg doesn't support static nested classes as main test classes, all EventTestTemplatess inner classes were moved up and the tests were updated accordingly
appended ${java.class.path} to -cp in the tests which specify classpath, otherwise, these tests fail due to CNFE of jtreg tests
escaped " on windows in nsk.share.jdi.Binder
replaced default quote (") w/ \0 in n.s.j.Binder so there will be no clashes w/ " from actions

testing: ✅ vmTestbase/nsk/jdi tests on {linux,windows,macos}-x64

Progress

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

Issue

JDK-8252001: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdi

Reviewers

Chris Plummer (@plummercj - Reviewer)
Serguei Spitsyn (@sspitsyn - Reviewer)

Download

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

…Binder)

bridgekeeper · 2020-09-28T14:11:55Z

👋 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.

openjdk · 2020-09-28T14:22:03Z

@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 pull request command.

mlbridge · 2020-09-28T15:52:52Z

Webrevs

00: Full (9e72214)

plummercj

Looks good. In the future I would like to see something like this broken up so as to not mix the smaller changes in with the massive repetitive changes.

openjdk · 2020-09-29T20:35:36Z

@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:

8252001: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdi

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

1eca634: 8252000: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdb
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
... and 32 more: https://git.openjdk.java.net/jdk/compare/79904c1fa385b41ad2ea12a183d859c6422d7fa5...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.

iignatev · 2020-09-29T20:44:19Z

Looks good. In the future I would like to see something like this broken up so as to not mix the smaller changes in with the massive repetitive changes.

thanks, Chris. unfortunately, most of the changes here weren't self-sufficient or meaningful on their own, so they couldn't be (easily?) broken up. you could have though reviewed the patch as if it were broken up by reviewing each particular commit separately.

sspitsyn · 2020-09-30T01:06:50Z

Igor,
Not sure, I understand some of the fixes.
For example:

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java
index 9b4967020b1..b75a9749208 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java
@@ -39,7 +39,7 @@
  *                 - add to request filter for single thread
  *                 - add to request filter for the same thread 2 times, expect behavior such as in previous case
  *                 - add to request filter for 2 different threads, so events shouldn't be received
- *         Test executes class nsk.share.jdi.EventTestTemplates$ClassExclusionFilterTest which uses JDI events testing
+ *         Test executes class nsk.share.jdi.ClassExclusionFilterTest which uses JDI events testing
  *         framework based on classes from package nsk.share.jdi.*.
  *         This framework uses following scenario:
  *                 - debugger VM forces debugge VM to create number of objects which should generate events during test
@@ -57,17 +57,17 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @build nsk.share.jdi.EventTestTemplates
+ * @build nsk.share.jdi.ThreadFilterTest
  *        nsk.share.jdi.JDIEventsDebuggee
  *        nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm/native PropertyResolvingWrapper
- *      nsk.share.jdi.EventTestTemplates$ThreadFilterTest
+ * @run main/othervm/native
+ *      nsk.share.jdi.ThreadFilterTest

The EventTestTemplates$StressTestTemplate is replaced with StressTestTemplate in the comment.
However, the @build and @run commands replaces the EventTestTemplates or EventTestTemplates$ThreadFilterTest with the ThreadFilterTest. Is this intentional?
There are several files with such mismatches.

iignatev · 2020-09-30T02:47:01Z

@sspitsyn , I just s/nsk.share.jdi.EventTestTemplates$/nsk.share.jdi and then replaced nsk.share.jdi.EventTestTemplates in @build w/ appropriate former inner class of n.s.j.EventTestTemplates, e.g. ThreadFilterTest. and the end, the tests execute the (simantically) same classes as before.

The discrepancy b/w comments and @run directives are pre-existing, I'll file a separate issue to clean them up.

sspitsyn

@iignatev
Thank you for explanation and filing a new bug.
I'm okay with this update.

iignatev · 2020-09-30T16:16:45Z

for the record, the RFE to clean up the comments -- 8253864

iignatev · 2020-09-30T16:16:50Z

/integrate

openjdk · 2020-09-30T16:18:46Z

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

8cf8e46: 8253700: spurious "extends Throwable" at end of Optional.orElseThrow method declaration
8b3d676: 8238737: remove DeoptimizeAllClassesRate from CTW library
709cfe5: 8253815: Remove unused HeapRegionManager::_num_committed from SA
f80a606: 8253375: OSX build fails with Xcode 12.0 (12A7209)
04775f1: 8253768: Deleting unused pipe_class definitions in adl-file (x86_64.ad).
dc3a0f5: 8253183: Fragile memory barrier selection for some weak memory model platforms
8331e63: 8253778: ShenandoahSafepoint::is_at_shenandoah_safepoint should not access VMThread state from other threads
4c65365: 8253792: javax.swing.text.GapContent documentation typos
3078b5f: 6441211: Small Error in API at javax.swing.plaf.synth.Region
4622a18: 8253791: Issue with useAppleColor check in CSystemColors.m
... and 44 more: https://git.openjdk.java.net/jdk/compare/79904c1fa385b41ad2ea12a183d859c6422d7fa5...master

Your commit was automatically rebased without conflicts.

Pushed as commit 8f7c9a7.

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

iignatev added 7 commits September 26, 2020 10:08

8252001: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdi

796349e

removed redundant ExecDriver

6d159f9

s/"-debugee.vmkeys=/-debugee.vmkeys="/

ebcffed

removed TEST.properties

67e1394

use \0 as quote and escape " on windows (as in nsk.share.jpda.Debugee…

8b70c49

…Binder)

moved up EventTestTemplates's inner classes

f96956c

append ${java.class.path} to -cp

fc5a1a3

openjdk bot added the serviceability label Sep 28, 2020

fixed whitespaces

9e72214

iignatev marked this pull request as ready for review September 28, 2020 15:47

openjdk bot added the rfr label Sep 28, 2020

plummercj approved these changes Sep 29, 2020

View reviewed changes

openjdk bot added the ready label Sep 29, 2020

sspitsyn approved these changes Sep 30, 2020

View reviewed changes

openjdk bot closed this Sep 30, 2020

openjdk bot added integrated and removed ready rfr labels Sep 30, 2020

iignatev deleted the 8252001 branch September 30, 2020 22:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8252001: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdi #379

8252001: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdi #379

iignatev commented Sep 28, 2020 •

edited by openjdk bot

Loading

bridgekeeper bot commented Sep 28, 2020

openjdk bot commented Sep 28, 2020

mlbridge bot commented Sep 28, 2020

plummercj left a comment

openjdk bot commented Sep 29, 2020 •

edited

Loading

iignatev commented Sep 29, 2020

sspitsyn commented Sep 30, 2020

iignatev commented Sep 30, 2020 •

edited

Loading

sspitsyn left a comment

iignatev commented Sep 30, 2020

iignatev commented Sep 30, 2020

openjdk bot commented Sep 30, 2020

8252001: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdi #379

8252001: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdi #379

Conversation

iignatev commented Sep 28, 2020 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Sep 28, 2020

openjdk bot commented Sep 28, 2020

mlbridge bot commented Sep 28, 2020

Webrevs

plummercj left a comment

Choose a reason for hiding this comment

openjdk bot commented Sep 29, 2020 • edited Loading

iignatev commented Sep 29, 2020

sspitsyn commented Sep 30, 2020

iignatev commented Sep 30, 2020 • edited Loading

sspitsyn left a comment

Choose a reason for hiding this comment

iignatev commented Sep 30, 2020

iignatev commented Sep 30, 2020

openjdk bot commented Sep 30, 2020

iignatev commented Sep 28, 2020 •

edited by openjdk bot

Loading

openjdk bot commented Sep 29, 2020 •

edited

Loading

iignatev commented Sep 30, 2020 •

edited

Loading