Skip to content

Conversation

@jonathan-gibbons
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons commented Sep 26, 2024

Please review a fix for some issues reported when running tests on Windows.

For GetSerialVersionUITest, the derivation of the working directory was broken in a couple of ways, which have both been fixed:

  1. the computation of the path name assumed all members were fields; whereas the test cases have evolved to include other complex members
  2. the work/scratch directory was being emptied between test cases, so that only the last one remained. there is a more appropriate method to use instead, so that all the working files are preserved

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/apidiff/pull/16.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 26, 2024

👋 Welcome back jjg! 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 Sep 26, 2024

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

7903846: apidiff: test issues on Windows

Reviewed-by: cstein, iris

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

  • a7e2218: 7903835: apidiff: CompareOptionsTest fails on recent JDK
  • 95b7345: 7903834: apidiff: DocPath issue on Windows
  • a10e142: 7903836: apidiff: Add GitHub Actions test workflow
  • a1bacee: 7903836: apidiff: Add GitHub Actions test workflow
  • b8685ae: 7903829: apidiff: update TestNG reference to JUnit
  • f2455f4: 7903822: Add toString for some internal types
  • 7a1dfd2: 7903823: Use correct key when building display of method return types
  • 5783eed: 7903802: apidiff: minor doc and related updates

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 changed the title CODETOOLS-7903846: apidiff: test issues on Windows 7903846: apidiff: test issues on Windows Sep 26, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 26, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 26, 2024

Webrevs

… merge conflict with an equivalent change in another PR.
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 27, 2024
@jonathan-gibbons
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 27, 2024

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

  • bb3eb15: 7903838: apidiff: Update Vintage JUnit test
  • c432f4a: 7903841: apidiff: IllegalStateException for RECORD in TypePageReporter
  • a7e2218: 7903835: apidiff: CompareOptionsTest fails on recent JDK
  • 95b7345: 7903834: apidiff: DocPath issue on Windows
  • a10e142: 7903836: apidiff: Add GitHub Actions test workflow
  • a1bacee: 7903836: apidiff: Add GitHub Actions test workflow
  • b8685ae: 7903829: apidiff: update TestNG reference to JUnit
  • f2455f4: 7903822: Add toString for some internal types
  • 7a1dfd2: 7903823: Use correct key when building display of method return types
  • 5783eed: 7903802: apidiff: minor doc and related updates

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 27, 2024

@jonathan-gibbons Pushed as commit dbaa7ac.

💡 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

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants