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

8299789: Compilation of gtest causes build to fail if runtime libraries are in different dirs #11899

Closed
wants to merge 1 commit into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Jan 9, 2023

The GtestImage.gmk is updated to use separate macro calls in case the runtime libraries are not in the same directory.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8299789: Compilation of gtest causes build to fail if runtime libraries are in different dirs

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/11899/head:pull/11899
$ git checkout pull/11899

Update a local copy of the PR:
$ git checkout pull/11899
$ git pull https://git.openjdk.org/jdk pull/11899/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11899

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11899.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2023

👋 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 Jan 9, 2023

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

  • build

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 build build-dev@openjdk.org label Jan 9, 2023
@mrserb mrserb marked this pull request as ready for review January 9, 2023 16:40
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 9, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 9, 2023

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this!

@openjdk
Copy link

openjdk bot commented Jan 9, 2023

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

8299789: Compilation of gtest causes build to fail if runtime libraries are in different dirs

Reviewed-by: erikj

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

  • cd10c72: 8299500: Usage of constructors of primitive wrapper classes should be avoided in java.text API docs
  • bfd5971: 8299757: Update JCov version to 3.0.14
  • 17a3f0e: 8299275: Add some ClassLoaderData verification code
  • 4ba8122: 8299312: Clean up BarrierSetNMethod
  • 66db0bb: 8299692: G1: Remove unused G1BlockOffsetTable::is_card_boundary
  • 7068457: 8298472: AArch64: Detect Ampere-1 and Ampere-1A CPUs and set default options
  • 500c3c1: 8298730: Refactor subsystem_file_line_contents and add docs and tests
  • 4072412: 8298876: Swing applications do not get repainted coming out of sleep on Windows 10
  • a503ec2: 8299608: Add Register + imm32 orq to x86_64 assembler
  • d2827ec: 8299671: speed up compiler/intrinsics/string/TestStringLatin1IndexOfChar.java
  • ... and 2 more: https://git.openjdk.org/jdk/compare/8d17d1ee6f08ee90771d469182aaaaa7c23971fd...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 Jan 9, 2023
@mrserb
Copy link
Member Author

mrserb commented Jan 10, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 10, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 10, 2023

@mrserb Pushed as commit c8a8388.

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

@mrserb mrserb deleted the JDK-8299789 branch January 10, 2023 10:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants