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

8315415: OutputAnalyzer.shouldMatchByLine() fails in some cases #1945

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Nov 2, 2023

I backport this for parity with 17.0.11-oracle.

Resolved Copyright, will mark clean if not recognized as such.


Progress

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

Issue

  • JDK-8315415: OutputAnalyzer.shouldMatchByLine() fails in some cases (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1945

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 2, 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 7b1e2bfe0f805a69b59839b6bf8250b62ea356b8 8315415: OutputAnalyzer.shouldMatchByLine() fails in some cases Nov 2, 2023
@openjdk
Copy link

openjdk bot commented Nov 2, 2023

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

@openjdk
Copy link

openjdk bot commented Nov 2, 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 2, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 2, 2023

Webrevs

@openjdk openjdk bot added the approval label Nov 6, 2023
@openjdk
Copy link

openjdk bot commented Nov 6, 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:

8315415: OutputAnalyzer.shouldMatchByLine() fails in some cases

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:

  • fa30733: 8318889: C2: add bailout after assert Bad graph detected in build_loop_late
  • 4b6ac09: 8317327: Remove JT_JAVA dead code in jib-profiles.js
  • 8018d07: 8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed
  • 340a389: 8309778: java/nio/file/Files/CopyAndMove.java fails when using second test directory
  • 401969c: 8298905: Test "java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java" fails because the frames of instruction does not display
  • e3d52aa: 8269425: 2 jdk/jfr/api/consumer/streaming tests failed to attach
  • 253acc6: 8271826: mark hotspot runtime/condy tests which ignore external VM flags
  • cd6cb73: 8310265: (process) jspawnhelper should not use argv[0]
  • d4ed7c2: 8318855: Extra file added by mistake during the backport of JDK-8283326
  • a273858: 8318669: Target OS detection in 'test-prebuilt' makefile target is incorrect when running on MSYS2

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 Nov 6, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Nov 7, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Nov 7, 2023

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

  • fc7650f: 8161536: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with ProviderException
  • d760d9d: 8314242: Update applications/scimark/Scimark.java to accept VM flags
  • aaa26d5: 8307123: Fix deprecation warnings in DPrinter
  • 64c2048: 8299241: jdk/jfr/api/consumer/streaming/TestJVMCrash.java generates unnecessary core file
  • f60d396: 8317920: JDWP-agent sends broken exception event with onthrow option
  • fa30733: 8318889: C2: add bailout after assert Bad graph detected in build_loop_late
  • 4b6ac09: 8317327: Remove JT_JAVA dead code in jib-profiles.js
  • 8018d07: 8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed
  • 340a389: 8309778: java/nio/file/Files/CopyAndMove.java fails when using second test directory
  • 401969c: 8298905: Test "java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java" fails because the frames of instruction does not display
  • ... and 5 more: https://git.openjdk.org/jdk17u-dev/compare/348a703c25e025ac170d45f5c2ddec28d8ac67b6...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 7, 2023

@GoeLin Pushed as commit 2486ba2.

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

@GoeLin GoeLin deleted the goetz_backport_8315415 branch November 7, 2023 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant