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

8301377: adjust timeout for JLI GetObjectSizeIntrinsicsTest.java subtest again #2392

Closed
wants to merge 1 commit into from

Conversation

amosshi
Copy link
Contributor

@amosshi amosshi commented Dec 15, 2023

Backport of JDK-8301377.
This same fix also fixed the following two tickets

Unclean Backport:

  • test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
    • This file has been ignored, because it does not exist in Java 11
    • Based on current history This file was added by JDK-8253525 on Java 16
  • test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java
    • Copyright year line manually merged.
    • driver/timeout=180 line manually merged
    • The change is exactly the same as the original commit
    • So the change to this file can be considered as Clean
  • test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load007/TestDescription.java
  • test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load011/TestDescription.java
  • test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load012/TestDescription.java
    • For the 3 files above, the only difference is the Copyright year line.
    • Manually merged this line
    • These 3 files can be considered as Clean

Tests

  • Test Succeeded in local Dev Apple M1 Laptop
  • PR: All checks have passed
  • SAP nightlies passed on 2023-12-23,24

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8301377 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8305502 needs maintainer approval
  • JDK-8302607 needs maintainer approval

Issues

  • JDK-8301377: adjust timeout for JLI GetObjectSizeIntrinsicsTest.java subtest again (Bug - P4 - Approved)
  • JDK-8302607: increase timeout for ContinuousCallSiteTargetChange.java (Bug - P5 - Approved)
  • JDK-8305502: adjust timeouts in three more M&M tests (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2392

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 15, 2023

👋 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 openjdk bot changed the title Backport 4b23bef51df9c1a5bc8f43748a8d6c8d99995656 8301377: adjust timeout for JLI GetObjectSizeIntrinsicsTest.java subtest again Dec 15, 2023
@openjdk
Copy link

openjdk bot commented Dec 15, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Dec 15, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 15, 2023

Webrevs

@amosshi
Copy link
Contributor Author

amosshi commented Dec 22, 2023

/approval request “Backporting for parity with jdk 11.0.22-oracle. No risk, test fix. UnClean backport. SAP nightlies passed on 2023-12-21”

@openjdk
Copy link

openjdk bot commented Dec 22, 2023

@amosshi
8301377: The approval request has been created successfully.
8302607: The approval request has been created successfully.
8305502: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Dec 22, 2023
@GoeLin
Copy link
Member

GoeLin commented Dec 22, 2023

@amosshi, Don't request approval if you don't have a review!

@openjdk openjdk bot removed the approval label Dec 22, 2023
@openjdk
Copy link

openjdk bot commented Dec 29, 2023

⚠️ @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 Dec 29, 2023

/approval request “Backporting for parity with jdk 11.0.22-oracle. No risk, test fix. UnClean backport. SAP nightlies passed on 2023-12-24”

@openjdk
Copy link

openjdk bot commented Dec 29, 2023

@amosshi
8301377: Approval has already been requested and approved.
8302607: The approval request has been updated successfully.
8305502: The approval request has been updated successfully.

@openjdk openjdk bot added the approval label Dec 29, 2023
@openjdk
Copy link

openjdk bot commented Dec 29, 2023

@amosshi This change now passes all automated pre-integration checks.

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

8301377: adjust timeout for JLI GetObjectSizeIntrinsicsTest.java subtest again
8302607: increase timeout for ContinuousCallSiteTargetChange.java
8305502: adjust timeouts in three more M&M tests

Reviewed-by: mbaesken

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

  • e55ee09: 8322752: [11u] GetStackTraceAndRetransformTest.java is failing assert
  • 96057c1: 8308043: Deadlock in TestCSLocker.java due to blocking GC while allocating
  • a6fc00a: 8269025: jsig/Testjsig.java doesn't check exit code
  • 43d4c50: 8271094: runtime/duplAttributes/DuplAttributesTest.java doesn't check exit code
  • 823b65a: 8271224: runtime/EnclosingMethodAttr/EnclMethodAttr.java doesn't check exit code
  • 234d2f0: 8316028: Update FreeType to 2.13.2
  • b31ee7f: 8253820: Save test images and dumps with timestamps from client sanity suite
  • f308f3e: 8198668: MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java still failing
  • d232723: 8285867: Convert applet manual tests SelectionVisible.java to Frame and automate
  • 879f7cf: 8253543: sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java failed with "AssertionError: All pixels are not black"
  • ... and 78 more: https://git.openjdk.org/jdk11u-dev/compare/e793bdd174ad976f567d0d911db42f67f6d7e59d...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@MBaesken) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Dec 29, 2023
@GoeLin
Copy link
Member

GoeLin commented Dec 29, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 29, 2023

@GoeLin The change author (@amosshi) must issue an integrate command before the integration can be sponsored.

@amosshi
Copy link
Contributor Author

amosshi commented Dec 30, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 30, 2023
@openjdk
Copy link

openjdk bot commented Dec 30, 2023

@amosshi
Your change (at version 6009342) is now ready to be sponsored by a Committer.

@MBaesken
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 30, 2023

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

  • d94b3f8: 8301846: Invalid TargetDataLine after screen lock when using JFileChooser or COM library
  • e55ee09: 8322752: [11u] GetStackTraceAndRetransformTest.java is failing assert
  • 96057c1: 8308043: Deadlock in TestCSLocker.java due to blocking GC while allocating
  • a6fc00a: 8269025: jsig/Testjsig.java doesn't check exit code
  • 43d4c50: 8271094: runtime/duplAttributes/DuplAttributesTest.java doesn't check exit code
  • 823b65a: 8271224: runtime/EnclosingMethodAttr/EnclMethodAttr.java doesn't check exit code
  • 234d2f0: 8316028: Update FreeType to 2.13.2
  • b31ee7f: 8253820: Save test images and dumps with timestamps from client sanity suite
  • f308f3e: 8198668: MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java still failing
  • d232723: 8285867: Convert applet manual tests SelectionVisible.java to Frame and automate
  • ... and 79 more: https://git.openjdk.org/jdk11u-dev/compare/e793bdd174ad976f567d0d911db42f67f6d7e59d...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 30, 2023
@openjdk openjdk bot closed this Dec 30, 2023
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Dec 30, 2023
@openjdk openjdk bot removed rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 30, 2023
@openjdk
Copy link

openjdk bot commented Dec 30, 2023

@MBaesken @amosshi Pushed as commit 4f91f8f.

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

@amosshi amosshi deleted the backport-8301377 branch December 30, 2023 16:40
@amosshi amosshi restored the backport-8301377 branch January 4, 2024 18:31
@amosshi amosshi deleted the backport-8301377 branch January 4, 2024 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants