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

8285523: Improve test java/io/FileOutputStream/OpenNUL.java #8379

Closed
wants to merge 1 commit into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Apr 25, 2022

The new test added as part of the JDK-8285445 cannot trigger that bug and pass w/ and w/o fix.

An updated test validates the "default" case when the jdk.io.File.enableADS property is not set, in this case the ADS should be accepted.


Progress

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

Issue

  • JDK-8285523: Improve test java/io/FileOutputStream/OpenNUL.java

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8379/head:pull/8379
$ git checkout pull/8379

Update a local copy of the PR:
$ git checkout pull/8379
$ git pull https://git.openjdk.java.net/jdk pull/8379/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8379

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8379.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 25, 2022

👋 Welcome back serb! 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 Apr 25, 2022

@mrserb The following label will be automatically applied to this pull request:

  • core-libs

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.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Apr 25, 2022
@mrserb mrserb marked this pull request as ready for review April 25, 2022 04:48
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 25, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 25, 2022

Webrevs

@mrserb mrserb changed the title 8285523: The test for JDK-8285445 can be improved 8285523: Improve test java/io/FileOutputStream/OpenNUL.java Apr 27, 2022
Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Changes look right to me. The test seems to have been based on the situation pre-patch, where setting the property to true worked around the bug. With the patch, only the false case actually exhibits the bug.

* @run main/othervm -Djdk.io.File.enableADS OpenNUL
* @run main/othervm -Djdk.io.File.enableADS=FalsE OpenNUL
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason for the mixed case? Just to check equalsIgnoreCase is being used?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes only for equalsIgnoreCase

@openjdk
Copy link

openjdk bot commented Apr 28, 2022

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

8285523: Improve test java/io/FileOutputStream/OpenNUL.java

Reviewed-by: andrew, bpb

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

  • b718578: 8285011: gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java fails after JDK-8280761
  • 2d8d140: 8285690: CloneableReference subtest should not throw CloneNotSupportedException
  • ea83b44: 8280510: AArch64: Vectorize operations with loop induction variable
  • 36bf6fb: 8285728: Alpine Linux build fails with busybox tar
  • 091637c: 8285630: Fix a configure error in RISC-V cross build
  • ccf0e8b: 8285755: JDK-8285093 changed the default for --with-output-sync
  • d7514b0: 8285595: Assert frame anchor doesn't change in safepoints/handshakes
  • 5629c75: 8284848: C2: Compiler blackhole arguments should be treated as globally escaping
  • 85f8d14: 8283994: Make Xerces DatatypeException stackless
  • 4f2e4c7: 8178969: [TESTBUG] Wrong reporting of gc/g1/humongousObjects/TestHeapCounters test.
  • ... and 57 more: https://git.openjdk.java.net/jdk/compare/9d9f4e502f6ddc3116ed9b80f7168a1edfce839e...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 added the ready Pull request is ready to be integrated label Apr 28, 2022
@mrserb
Copy link
Member Author

mrserb commented Apr 29, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Apr 29, 2022

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

  • b71e8c1: 8285711: riscv: RVC: Support disassembler show-bytes option
  • e406662: 8282711: Accelerate Math.signum function for AVX and AVX512 target.
  • 0a4a640: 8285301: C2: assert(!requires_atomic_access) failed: can't ensure atomicity
  • 40f19c0: 8264666: Change implementation of safeAdd/safeMult in the LCMSImageLayout class
  • 1e28fcb: 8155701: The compiler fails with an AssertionError: typeSig ERROR
  • 99388ef: 8283624: Create an automated regression test for RFE-4390885
  • 94b533a: 8285699: riscv: Provide information when hitting a HaltNode
  • e2e943a: 8285688: Add links to JEPs and JSRs to SourceVersion
  • 80cf59f: 8285610: TreeInfo.pathFor and its uses appear to be dead code
  • 21b62fe: 8195589: T6587786.java failed after JDK-8189997
  • ... and 72 more: https://git.openjdk.java.net/jdk/compare/9d9f4e502f6ddc3116ed9b80f7168a1edfce839e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 29, 2022

@mrserb Pushed as commit f42631e.

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

@mrserb mrserb deleted the JDK-8285523 branch November 28, 2022 03:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
3 participants