JDK-8297215: Update libs tests to use @enablePreview #11222

jddarcy · 2022-11-17T21:48:11Z

Similar to an update recently done for langtools tests, update the libraries regression tests to take advantage of the @enablePreview jtreg feature.

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-8297215: Update libs tests to use @enablePreview

Reviewers

Alan Bateman (@AlanBateman - Reviewer) ⚠️ Review applies to 6d11bbca
Serguei Spitsyn (@sspitsyn - Reviewer) ⚠️ Review applies to 6d11bbca

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11222

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

Using diff file

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

bridgekeeper · 2022-11-17T21:49:49Z

👋 Welcome back darcy! 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 · 2022-11-17T21:52:12Z

@jddarcy The following labels will be automatically applied to this pull request:

core-libs
hotspot-jfr
net
serviceability

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

mlbridge · 2022-11-17T21:55:43Z

Webrevs

AlanBateman · 2022-11-18T08:28:22Z

test/jdk/java/lang/Thread/BuilderTest.java

- * @run testng/othervm --enable-preview BuilderTest
+ * @enablePreview
+ * @compile BuilderTest.java
+ * @run testng/othervm BuilderTest


I assume @compile can be dropped from most of these tests now. Also I think /othervm can be dropped too because jtreg will always use othervm for tests that require --enable-preview. When the feature becomes permanent then it would mean dropping the @enablePreview tag, no other changes.

Right; ideally when the feature becomes non-preview the test update would just be removing the "@enablePreview" line. I didn't author these tests so I initially left any "othervm" directives in place since they aren't incorrect, just at worst a bit inefficient.

@enablePreview wasn't available when most of these tests were initially created. I changed some of to use this tag as part of other changes but didn't cover over the remaining tests that still use @compile --enable-preview -source ${jdk.version} ... and @run main/othervm --enable-preview .... I just scanned the tests in test/jdk/java/lang/Thread/virtual and they can all be changed the same way, if you want. If you leave it then we'll just change them at the next edit in this area.

I think I got most of those in the PR. There was a file or two I didn't update because not all the @compile/@run directives in the file used --enablePreview and the @enablePreview directive applies to all @compile and @run directives.

Most of the tests in test/jdk/java/lang/Thread/virtual/ still have @compile and othervm, is it possible you didn't push the update with those changes?

AlanBateman · 2022-11-18T08:29:00Z

test/jdk/java/lang/Thread/virtual/JfrEvents.java

- * @run testng/othervm --enable-preview JfrEvents
+ * @enablePreview
+ * @compile JfrEvents.java
+ * @run testng/othervm JfrEvents


This one needs to be /othervm.

AlanBateman · 2022-12-01T07:57:52Z

test/jdk/java/net/Socket/Timeouts.java

- * @compile --enable-preview -source ${jdk.version} Timeouts.java
- * @run testng/othervm/timeout=180 --enable-preview Timeouts
+ * @enablePreview
+ * @compile Timeouts.java


I assume the @compile can be dropped from this one, doesn't matter.

AlanBateman

Latest update looks good, will make the test changes easy when features move from preview to permanent.

openjdk · 2022-12-01T08:01:26Z

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

8297215: Update libs tests to use @enablePreview

Reviewed-by: alanb, 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 1 new commit pushed to the master branch:

5a5ced3: 8297830: aarch64: Make Address a discriminated union internally

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.

sspitsyn · 2022-12-01T08:41:31Z

test/jdk/java/lang/Thread/virtual/GetStackTraceWhenRunnable.java

- * @compile --enable-preview -source ${jdk.version} GetStackTraceWhenRunnable.java
- * @run main/othervm --enable-preview -Djdk.virtualThreadScheduler.maxPoolSize=1 GetStackTraceWhenRunnable
+ * @enablePreview
+ * @compile GetStackTraceWhenRunnable.java


Nit: Is the line 29 for compiling necessary?

sspitsyn · 2022-12-01T08:43:42Z

test/jdk/java/lang/instrument/ParallelTransformerLoaderTest.java

@@ -34,7 +34,7 @@
 * @requires vm.continuations
 * @library /test/lib
 * @run build TestClass1 TestClass2 TestClass3
- * @compile --enable-preview -source ${jdk.version} ParallelTransformerLoaderTest.java
+  * @compile --enable-preview -source ${jdk.version} ParallelTransformerLoaderTest.java


Nit: This change is strange. It is either not needed or missing something.

sspitsyn · 2022-12-01T08:44:17Z

test/jdk/java/lang/runtime/SwitchBootstrapsTest.java

- * @compile --enable-preview -source ${jdk.version} SwitchBootstrapsTest.java
- * @run testng/othervm --enable-preview SwitchBootstrapsTest
+ * @enablePreview
+ * @compile SwitchBootstrapsTest.java


Nit: Is the line 41 for compiling necessary?

sspitsyn · 2022-12-01T08:45:37Z

test/jdk/java/net/vthread/HttpALot.java

@@ -28,12 +28,12 @@
 * @requires vm.debug != true
 * @modules jdk.httpserver
 * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} HttpALot.java
+ * @enablePreview
+ * @compile HttpALot.java


Nit: Is the line 32 for compiling necessary?

sspitsyn · 2022-12-01T08:45:57Z

test/jdk/java/net/vthread/InterruptHttp.java

- * @compile --enable-preview -source ${jdk.version} InterruptHttp.java
- * @run main/othervm --enable-preview InterruptHttp
+ * @enablePreview
+ * @compile InterruptHttp.java


Nit: Is the line 29 for compiling necessary?

sspitsyn · 2022-12-01T08:48:59Z

test/jdk/jdk/jfr/event/runtime/TestThreadSleepEvent.java

- * @compile --enable-preview -source ${jdk.version} TestThreadSleepEvent.java
- * @run main/othervm --enable-preview jdk.jfr.event.runtime.TestThreadSleepEvent
+ * @enablePreview
+ * @compile TestThreadSleepEvent.java


Nit: Is the line 44 for compiling necessary?

sspitsyn · 2022-12-01T08:50:58Z

test/jdk/jdk/jfr/threading/TestManyVirtualThreads.java

- * @compile --enable-preview -source ${jdk.version} TestManyVirtualThreads.java
- * @run main/othervm --enable-preview jdk.jfr.threading.TestManyVirtualThreads
+ * @enablePreview
+ * @compile TestManyVirtualThreads.java


Nit: Not sure the line 47 for compiling is necessary?

sspitsyn · 2022-12-01T08:51:16Z

test/jdk/jdk/jfr/threading/TestNestedVirtualThreads.java

- * @compile --enable-preview -source ${jdk.version} TestNestedVirtualThreads.java
- * @run main/othervm --enable-preview jdk.jfr.threading.TestNestedVirtualThreads
+ * @enablePreview
+ * @compile TestNestedVirtualThreads.java


Nit: Not sure the line 45 for compiling is necessary?

sspitsyn

Looks good.
Posted several nits though.
Thanks,
Serguei

egahlin · 2022-12-01T19:19:01Z

test/jdk/jdk/jfr/threading/TestDeepVirtualStackTrace.java

- * @compile --enable-preview -source ${jdk.version} TestDeepVirtualStackTrace.java
- * @run main/othervm --enable-preview -XX:FlightRecorderOptions:stackdepth=2048
+ * @enablePreview
+ * @compile TestDeepVirtualStackTrace.java


Is compilation needed here?

For the two tests that compiled a single file, I removed the @compile directive. Any additional refactoring left for future work.

jddarcy · 2022-12-01T20:35:52Z

/integrate

openjdk · 2022-12-01T20:38:37Z

Going to push as commit 770ff5a.
Since your change was applied there have been 2 commits pushed to the master branch:

c69aa42: 8297968: Crash in PrintOptoAssembly
5a5ced3: 8297830: aarch64: Make Address a discriminated union internally

Your commit was automatically rebased without conflicts.

openjdk · 2022-12-01T20:38:56Z

@jddarcy Pushed as commit 770ff5a.

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

JDK-8297215: Update libs tests to use @enablePreview

88a566c

openjdk bot added the rfr Pull request is ready for review label Nov 17, 2022

openjdk bot added serviceability serviceability-dev@openjdk.org core-libs core-libs-dev@openjdk.org net net-dev@openjdk.org hotspot-jfr hotspot-jfr-dev@openjdk.org labels Nov 17, 2022

AlanBateman reviewed Nov 18, 2022

View reviewed changes

jddarcy added 3 commits November 18, 2022 10:36

Respond to review feedback.

f3fc9e2

Merge branch 'master' into JDK-8297215

b3d8135

Respond to review feedback.

6d11bbc

AlanBateman reviewed Dec 1, 2022

View reviewed changes

AlanBateman approved these changes Dec 1, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 1, 2022

sspitsyn reviewed Dec 1, 2022

View reviewed changes

sspitsyn approved these changes Dec 1, 2022

View reviewed changes

Respond to review feedback.

c0bef63

egahlin reviewed Dec 1, 2022

View reviewed changes

Merge branch 'master' into JDK-8297215

3bce4c1

Remove unnecessary @compile directives.

d03ba04

openjdk bot added ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated labels Dec 1, 2022

openjdk bot added the integrated Pull request has been integrated label Dec 1, 2022

openjdk bot closed this Dec 1, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 1, 2022

jddarcy deleted the JDK-8297215 branch June 10, 2023 20:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JDK-8297215: Update libs tests to use @enablePreview #11222

JDK-8297215: Update libs tests to use @enablePreview #11222

jddarcy commented Nov 17, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 17, 2022

openjdk bot commented Nov 17, 2022

mlbridge bot commented Nov 17, 2022 •

edited

Loading

AlanBateman Nov 18, 2022 •

edited

Loading

jddarcy Nov 18, 2022

AlanBateman Nov 18, 2022

jddarcy Nov 18, 2022

AlanBateman Nov 19, 2022

AlanBateman Nov 18, 2022

AlanBateman Dec 1, 2022

AlanBateman left a comment

openjdk bot commented Dec 1, 2022 •

edited

Loading

sspitsyn Dec 1, 2022

sspitsyn Dec 1, 2022

sspitsyn Dec 1, 2022

sspitsyn Dec 1, 2022

sspitsyn Dec 1, 2022

sspitsyn Dec 1, 2022

sspitsyn Dec 1, 2022

sspitsyn Dec 1, 2022

sspitsyn left a comment

egahlin Dec 1, 2022

jddarcy Dec 1, 2022 •

edited

Loading

jddarcy commented Dec 1, 2022

openjdk bot commented Dec 1, 2022

openjdk bot commented Dec 1, 2022

JDK-8297215: Update libs tests to use @enablePreview #11222

JDK-8297215: Update libs tests to use @enablePreview #11222

Conversation

jddarcy commented Nov 17, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Nov 17, 2022

openjdk bot commented Nov 17, 2022

mlbridge bot commented Nov 17, 2022 • edited Loading

Webrevs

AlanBateman Nov 18, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AlanBateman left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 1, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sspitsyn left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jddarcy Dec 1, 2022 • edited Loading

Choose a reason for hiding this comment

jddarcy commented Dec 1, 2022

openjdk bot commented Dec 1, 2022

openjdk bot commented Dec 1, 2022

jddarcy commented Nov 17, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Nov 17, 2022 •

edited

Loading

AlanBateman Nov 18, 2022 •

edited

Loading

openjdk bot commented Dec 1, 2022 •

edited

Loading

jddarcy Dec 1, 2022 •

edited

Loading