Navigation Menu

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

8291911: java/io/File/GetXSpace.java fails with "53687091200 != 161051996160" #1912

Closed
wants to merge 5 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 24, 2023

I backport this for parity with 17.0.*-oracle.
This is a chain of 4 fixes to that test. I backport them as one piece as parts always cause errors here and there.

https://bugs.openjdk.org/browse/JDK-8291911

I had to resolve because of the double ;;.
Also it is not problemlisted in 17.

https://bugs.openjdk.org/browse/JDK-8298619

I had to resolve JtregNativeJdk.gmk due to context.

https://bugs.openjdk.org/browse/JDK-8305646
https://bugs.openjdk.org/browse/JDK-8309216
both clean.


Progress

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

Issues

  • JDK-8291911: java/io/File/GetXSpace.java fails with "53687091200 != 161051996160" (Bug - P3 - Approved)
  • JDK-8298619: java/io/File/GetXSpace.java is failing (Bug - P4 - Approved)
  • JDK-8305646: compile error on Alpine with gcc12 after 8298619 in libGetXSpace.c (Bug - P3 - Approved)
  • JDK-8309216: Cast from jchar* to char* in test java/io/GetXSpace.java (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1912

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

Using diff file

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

Webrev

Link to Webrev Comment

@GoeLin GoeLin marked this pull request as draft October 24, 2023 13:42
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 24, 2023

👋 Welcome back goetz! 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 749335d34ac570760279ac81308d5d323aba4067 8291911: java/io/File/GetXSpace.java fails with "53687091200 != 161051996160" Oct 24, 2023
@openjdk
Copy link

openjdk bot commented Oct 24, 2023

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

@openjdk openjdk bot added the backport label Oct 24, 2023
@GoeLin GoeLin marked this pull request as ready for review October 25, 2023 06:33
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 25, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 25, 2023

Webrevs

Copy link

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

⚠️ @GoeLin 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.

@GoeLin
Copy link
Member Author

GoeLin commented Oct 25, 2023

/issue JDK-8298619 JDK-8305646 JDK-8309216

@openjdk openjdk bot added the approval label Oct 25, 2023
@openjdk
Copy link

openjdk bot commented Oct 25, 2023

@GoeLin
Adding additional issue to issue list: 8298619: java/io/File/GetXSpace.java is failing.

Adding additional issue to issue list: 8305646: compile error on Alpine with gcc12 after 8298619 in libGetXSpace.c.

Adding additional issue to issue list: 8309216: Cast from jchar* to char* in test java/io/GetXSpace.java.

@RealCLanger
Copy link
Contributor

/approve yes

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

@RealCLanger
8291911: The approval request has been approved.
8298619: The approval request has been approved.
8305646: The approval request has been approved.
8309216: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

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

8291911: java/io/File/GetXSpace.java fails with "53687091200 != 161051996160"
8298619: java/io/File/GetXSpace.java is failing
8305646: compile error on Alpine with gcc12 after 8298619 in libGetXSpace.c
8309216: Cast from jchar* to char* in test java/io/GetXSpace.java

Reviewed-by: lucy

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

  • 2a9f6e8: 8315644: increase timeout of sun/security/tools/jarsigner/Warning.java
  • d4fe30d: 8316778: test hprof lib: invalid array element type from JavaValueArray.elementSize
  • 73e4745: 8312592: New parentheses warnings after HarfBuzz 7.2.0 update
  • c83100c: 8299207: [Testbug] Add back test/jdk/java/awt/Graphics2D/DrawPrimitivesTest.java
  • 39c8bb2: 8202931: [macos] java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java fails
  • 8bde7d4: 8239801: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails
  • 5eeb41a: 8293563: [macos-aarch64] SA core file tests failing with sun.jvm.hotspot.oops.UnknownOopException
  • 748ccc5: 8176567: nsk/jdi/ReferenceType/instances/instances002: TestFailure: Unexpected size of referenceType.instances(nsk.share.jdi.TestInterfaceImplementer1): 11, expected: 10
  • ffb4ef2: 8275329: ZGC: vmTestbase/gc/gctests/SoftReference/soft004/soft004.java fails with assert(_phases->length() <= 1000) failed: Too many recored phases?
  • 9a1f8cb: 8311511: Improve description of NativeLibrary JFR event

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.

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

GoeLin commented Oct 26, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 26, 2023

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

  • 5a9ceba: 8228990: JFR: TestNetworkUtilizationEvent.java expects 2+ Network interfaces on Linux but finding 1
  • 93127b4: 8273456: Do not hold ttyLock around stack walking
  • 2c75188: 8225313: serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatObjectCorrectnessTest.java failed with Unexpected high difference percentage
  • 8258f27: 8313252: Java_sun_awt_windows_ThemeReader_paintBackground release resources in early returns
  • 2a9f6e8: 8315644: increase timeout of sun/security/tools/jarsigner/Warning.java
  • d4fe30d: 8316778: test hprof lib: invalid array element type from JavaValueArray.elementSize
  • 73e4745: 8312592: New parentheses warnings after HarfBuzz 7.2.0 update
  • c83100c: 8299207: [Testbug] Add back test/jdk/java/awt/Graphics2D/DrawPrimitivesTest.java
  • 39c8bb2: 8202931: [macos] java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java fails
  • 8bde7d4: 8239801: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails
  • ... and 4 more: https://git.openjdk.org/jdk17u-dev/compare/73c3316c2fb658c4d495433c79d616a1fbe61209...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 26, 2023

@GoeLin Pushed as commit f85053f.

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

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
3 participants