Skip to content

8314837: 5 compiled/codecache tests ignore VM flags#2788

Closed
amosshi wants to merge 2 commits intoopenjdk:masterfrom
amosshi:backport-8314837
Closed

8314837: 5 compiled/codecache tests ignore VM flags#2788
amosshi wants to merge 2 commits intoopenjdk:masterfrom
amosshi:backport-8314837

Conversation

@amosshi
Copy link
Contributor

@amosshi amosshi commented Aug 8, 2024

Backport of JDK-8314837

  • This PR has two commits
  • commit 1 generated by git patch, so it is considered as Clean
  • commit 2 is the manual merge of test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java.rej, content as bellow
@@ -54,7 +55,7 @@
     }
 
     public static void runTest() throws Throwable {
-        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+        ProcessBuilder pb = ProcessTools.createTestJvm(
           "-XX:ReservedCodeCacheSize=2496k", "-XX:-UseCodeCacheFlushing", "-XX:-MethodFlushing", "CodeCacheFullCountTest", "WasteCodeCache");
         OutputAnalyzer oa = ProcessTools.executeProcess(pb);
         // Ignore adapter creation failures

Testing

  • Local: Test passed on MacOS 14.6.1 on Apple M1 Max
    • CheckCodeCacheInfo.java: Test results: passed: 1
    • CodeCacheFullCountTest.java: Test results: passed: 1
    • TestSegmentedCodeCacheOption.java: Test results: passed: 1
    • TestCodeHeapSizeOptions.java: Test results: passed: 1
    • TestPrintCodeCacheOption.java: Test results: passed: 1
  • Pipeline: 1 failing (macos-x64) and 18 successful checks
  • Testing Machine: SAP nightlies Passed on 2024-08-15
    • Automated jtreg test: jtreg_hotspot_tier1, Started at 2024-08-14 22:02:58+01:00
    • compiler/codecache/CheckCodeCacheInfo.java: SUCCESSFUL GitHub 📊 - [22:03:42.440 -> 1,493 msec]
    • compiler/codecache/CodeCacheFullCountTest.java: SUCCESSFUL GitHub 📊 - [22:03:46.390 -> 6,931 msec]
    • compiler/codecache/cli/TestSegmentedCodeCacheOption.java: SUCCESSFUL GitHub 📊 - [22:10:17.893 -> 1,271 msec]
    • compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java: SUCCESSFUL GitHub 📊 - [22:10:15.984 -> 8,110 msec]
    • compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java: SUCCESSFUL GitHub 📊 - [22:10:17.300 -> 2,223 msec]

Progress

  • Change must not contain extraneous whitespace
  • JDK-8314837 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8314837: 5 compiled/codecache tests ignore VM flags (Sub-task - P5 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2788/head:pull/2788
$ git checkout pull/2788

Update a local copy of the PR:
$ git checkout pull/2788
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2788/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2788

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2788.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 8, 2024

👋 Welcome back ashi! 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
Copy link

openjdk bot commented Aug 8, 2024

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

8314837: 5 compiled/codecache tests ignore VM flags

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

  • d90d028: 8318089: Class space not marked as such with NMT when CDS is off
  • 5e0e2e3: 8337038: Test java/nio/file/attribute/BasicFileAttributeView/CreationTime.java shoud set as /native
  • 1f45ae8: 8304375: jdk/jfr/api/consumer/filestream/TestOrdered.java failed with "Expected at least some events to be out of order! Reuse = false"
  • 185e69a: 8334166: Enable binary check
  • 9990cfa: 8272558: IR Test Framework README misses some flags
  • 0330069: 8316973: GC: Make TestDisableDefaultGC use createTestJvm
  • 7f78f21: 8316285: Opensource JButton manual tests
  • c09ca4e: 8328642: Convert applet test MouseDraggedOutCauseScrollingTest.html to main
  • 971b01a: 8315965: Open source various AWT applet tests
  • 0b789c1: 8332113: Update nsk.share.Log to be always verbose
  • ... and 5 more: https://git.openjdk.org/jdk17u-dev/compare/13f6ab3e195419ff8a3987f9b98035f1581292cd...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.

@openjdk openjdk bot changed the title Backport 2a11bc41baec20cf670393ff29689043ed2d2114 8314837: 5 compiled/codecache tests ignore VM flags Aug 8, 2024
@openjdk
Copy link

openjdk bot commented Aug 8, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Aug 8, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 8, 2024

Webrevs

@openjdk openjdk bot added the clean Identical backport; no merge resolution required label Aug 8, 2024
@openjdk
Copy link

openjdk bot commented Aug 8, 2024

⚠️ @amosshi This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@amosshi
Copy link
Contributor Author

amosshi commented Aug 16, 2024

/approval request "Backporting for parity with 17.0.13-oracle. No risk, test fix. Clean backport. Test passes and SAP nightlies pass on 2024-08-15”

@openjdk
Copy link

openjdk bot commented Aug 16, 2024

@amosshi
8314837: The approval request has been created successfully.

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Aug 16, 2024
@amosshi
Copy link
Contributor Author

amosshi commented Aug 16, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Aug 16, 2024

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

  • 7b205d6: 8325022: Incorrect error message on client authentication
  • d90d028: 8318089: Class space not marked as such with NMT when CDS is off
  • 5e0e2e3: 8337038: Test java/nio/file/attribute/BasicFileAttributeView/CreationTime.java shoud set as /native
  • 1f45ae8: 8304375: jdk/jfr/api/consumer/filestream/TestOrdered.java failed with "Expected at least some events to be out of order! Reuse = false"
  • 185e69a: 8334166: Enable binary check
  • 9990cfa: 8272558: IR Test Framework README misses some flags
  • 0330069: 8316973: GC: Make TestDisableDefaultGC use createTestJvm
  • 7f78f21: 8316285: Opensource JButton manual tests
  • c09ca4e: 8328642: Convert applet test MouseDraggedOutCauseScrollingTest.html to main
  • 971b01a: 8315965: Open source various AWT applet tests
  • ... and 6 more: https://git.openjdk.org/jdk17u-dev/compare/13f6ab3e195419ff8a3987f9b98035f1581292cd...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 16, 2024
@openjdk openjdk bot closed this Aug 16, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 16, 2024
@openjdk
Copy link

openjdk bot commented Aug 16, 2024

@amosshi Pushed as commit e291bfa.

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

@amosshi amosshi deleted the backport-8314837 branch August 16, 2024 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant