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

8273361: InfoOptsTest is failing in tier1 #5381

Closed
wants to merge 4 commits into from

Conversation

shipilev
Copy link
Contributor

@shipilev shipilev commented Sep 6, 2021

Current test checks that informational messages are not printed twice. The failing tests verifies that by checking java.specification.version is not present twice in the version string. Effectively, it searches for 18. But a second 18 could get to version string from anywhere: the Git hash, the user name, etc. It is failing in current GHA due to Git hash containing 18.

I believe the test should be more conservative: look for more unique strings, and check that the lines start with it. "javac" and "javac full version" seem unique enough. Checking that lines start with "javac" handles the case of accidental version strings that includes that string (think username that includes "javac" for some reason, who are we to judge...).

Additional testing:

  • Affected test passes with default version string
  • Affected test fails with JDK-8266239 reverted
  • Affected test passes with --with-version-opt=javac

Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5381

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 6, 2021

👋 Welcome back shade! 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 openjdk bot commented Sep 6, 2021

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

  • compiler

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 compiler label Sep 6, 2021
@shipilev shipilev changed the title Do not look for specification version in the version string 8273361: InfoOptsTest is failing in tier1 Sep 6, 2021
@openjdk openjdk bot added the rfr label Sep 6, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 6, 2021

Webrevs

@jaikiran
Copy link
Member

@jaikiran jaikiran commented Sep 8, 2021

I'm not a Reviewer, nor an expert in this area, but this change looks OK to me.

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Sep 8, 2021

Thanks for review, @jaikiran. Any formal Reviewer wants to chime in? Would be nice to get GHA all green again.

magicus
magicus approved these changes Sep 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

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

8273361: InfoOptsTest is failing in tier1

Reviewed-by: jpai, ihse, jlahoda

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

  • faa942c: 8273000: Remove WeakReference-based class initialisation barrier implementation
  • 21012f2: 8078641: MethodHandle.asTypeCache can retain classes from unloading
  • 1855574: 8273038: ChannelInputStream.transferTo() uses FileChannel.transferTo(FileChannel)
  • 6750c34: 8270533: AArch64: size_fits_all_mem_uses should return false if its output is a CAS
  • a66629a: 8254167: G1: Record regions where evacuation failed to provide targeted iteration
  • 286a1f6: 8273440: Zero: Disable runtime/Unsafe/InternalErrorTest.java
  • 7d24a33: 8273318: Some containers/docker/TestJFREvents.java configs are running out of memory
  • 1513dc7: 8271603: Unnecessary Vector usage in java.desktop
  • ea4907a: 8273047: test jfr/api/consumer/TestRecordedFrame.java timing out
  • 4eacdb3: 8273104: Refactoring option parser for UL
  • ... and 19 more: https://git.openjdk.java.net/jdk/compare/44c5c23b96adf071339b39cfaea08c2d3a19d839...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 label Sep 8, 2021
@lahodaj
Copy link
Contributor

@lahodaj lahodaj commented Sep 8, 2021

It would seem better to me if the test didn't depend on hardcoded localized strings (e.g. by printing the content of e.g. javac --help and checking the result is the same for javac --help --help; or by reading the bundle and using it as a template; or by checking if there are any duplicate line if the output), but since the test didn't do it originally, I don't think it is a stopper.

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Sep 8, 2021

by printing the content of e.g. javac --help and checking the result is the same for javac --help --help;

Oh, I like that idea. See new commit.

lahodaj
lahodaj approved these changes Sep 8, 2021
Copy link
Contributor

@lahodaj lahodaj left a comment

Looks good to me.

magicus
magicus approved these changes Sep 8, 2021
@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Sep 8, 2021

GHA checks are green, I am integrating.

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

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

  • f7e9f56: 8273359: CI: ciInstanceKlass::get_canonical_holder() doesn't respect instance size
  • d7efd0e: 8273450: Fix the copyright header of SVML files
  • e5f298a: 8273329: Remove redundant null check from String.getBytes(String charsetName)
  • cb112af: 8269373: some tests in jdk/tools/launcher/ fails on localized Windows platform
  • 7e662e7: 8272413: Incorrect num of element count calculation for vector cast
  • f2f8136: 8265443: IGV: disambiguate groups by emiting additional properties
  • 59c9f75: 8273375: Remove redundant 'new String' calls after concatenation in java.desktop
  • faa942c: 8273000: Remove WeakReference-based class initialisation barrier implementation
  • 21012f2: 8078641: MethodHandle.asTypeCache can retain classes from unloading
  • 1855574: 8273038: ChannelInputStream.transferTo() uses FileChannel.transferTo(FileChannel)
  • ... and 26 more: https://git.openjdk.java.net/jdk/compare/44c5c23b96adf071339b39cfaea08c2d3a19d839...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 8, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

@shipilev Pushed as commit 267c61a.

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

@shipilev shipilev deleted the JDK-8273361-InfoOptsTest branch Sep 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler integrated
4 participants