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

8289798: Update to use jtreg 7 #1595

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jul 18, 2023

I want to backport this on the path to jtreg 7.2.

I had to move the edit of lib-tests.m4 to toolchain.m4

All the others I resolved because we skipped the step to 6.1.


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-8289798: Update to use jtreg 7 (Enhancement - P3)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1595

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 18, 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 1ee59adcfead2128316556121c1711d308c7ea01 8289798: Update to use jtreg 7 Jul 18, 2023
@openjdk
Copy link

openjdk bot commented Jul 18, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 18, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 18, 2023

Webrevs

@GoeLin GoeLin marked this pull request as draft July 18, 2023 14:57
@openjdk openjdk bot removed the rfr Pull request is ready for review label Jul 18, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jul 18, 2023

GHA: broken. something wrong with locale. need to fix.

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

jib-profiles.js line 209 looks like a typo. JTeport s/b JTreport.

@shipilev
Copy link
Member

Hey @GoeLin, we need to get jtreg updates in 17u :) Have you got any luck with figuring out the locale problem? Do you have time to work on it? Would you like me to try this separately?

@gnu-andrew
Copy link
Member

gnu-andrew commented Aug 17, 2023

@gnu-andrew
Copy link
Member

javadoc seems to be scanning inside the testng provided by jtreg:

/home/runner/work/jdk17u-dev/jdk17u-dev/jtreg/installed/lib/testng-7.3.0.jar(/Version.java):12: error: unmappable character (0xC3) for encoding US-ASCII
        System.out.println("...\\\\n... TestNG " + getVersionString() + " by C??dric Beust (cedric@beust.com)\\\\n...\\\\n");

@lutkerd
Copy link
Contributor

lutkerd commented Aug 17, 2023

Hey @GoeLin, we need to get jtreg updates in 17u :) Have you got any luck with figuring out the locale problem? Do you have time to work on it? Would you like me to try this separately?

I think backporting 8260265: UTF-8 by Default is the fix for the locale issues. If that is too much we would need to add -encoding UTF-8 to the javadoc calls.

@gnu-andrew
Copy link
Member

Hey @GoeLin, we need to get jtreg updates in 17u :) Have you got any luck with figuring out the locale problem? Do you have time to work on it? Would you like me to try this separately?

I think backporting 8260265: UTF-8 by Default is the fix for the locale issues. If that is too much we would need to add -encoding UTF-8 to the javadoc calls.

That's a JEP implementation (https://bugs.openjdk.org/browse/JDK-8187041) so not suitable for backport. I guess test/langtools/jdk/javadoc/lib/javadoc/tester/JavadocTester.java would need to be altered, but it already seems to be setting UTF-8 unless explicitly told not to:

        if (docencodingArg == null) {
            if (charsetArg == null) {
                cs = (encodingArg == null) ? "UTF-8" : encodingArg;
            } else {
                cs = charsetArg;
            }
        } else {
            cs = docencodingArg;

I guess we could try an explicit character set for these test cases. I'm unable to reproduce this locally, so it's hard to assess what's actually going on, and why it is even looking inside the testng JAR in the first place.

@lutkerd
Copy link
Contributor

lutkerd commented Aug 17, 2023

I guess we could try an explicit character set for these test cases. I'm unable to reproduce this locally, so it's hard to assess what's actually going on, and why it is even looking inside the testng JAR in the first place.

#1672 sets the encoding and is working for me locally.

@gnu-andrew
Copy link
Member

@GoeLin looks like we can bring this one in as is and follow it up with #1672 to get the langtools tests fixed. #1673 is optional. We put it in the loop to fix the gcc versioning but that should be sorted when this one is merged on top of current master.

@shipilev
Copy link
Member

This is superseded by #1712.

@GoeLin GoeLin closed this Sep 12, 2023
@GoeLin GoeLin deleted the goetz_backport_8289798 branch February 1, 2024 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5 participants