8231179: Investigate why tools/javac/options/BCPOrSystemNotSpecified.java fails on Window #2004

lgxbslgx · 2021-01-08T13:33:34Z

Hi all,

The statement String sourcePath = file.getName(); in method prepareBCP(Path target) would use DirectoryFileObject::getName which is shown below.

@Override @DefinedBy(Api.COMPILER)
public String getName() {
    return relativePath.resolveAgainst(userPackageRootDir).toString();  // <-----------------
}

And the DirectoryFileObject::getName would use RelativePath::resolveAgainst which is shown below

public Path resolveAgainst(Path directory) throws /*unchecked*/ InvalidPathException {
    String sep = directory.getFileSystem().getSeparator();  // <---------------------
    return directory.resolve(path.replace("/", sep));
}

We can see that RelativePath::resolveAgainst use file system separator instead of operating system separator. In method prepareBCP, the file system should be JRT file system, but we don't need to know actually which file system to be used. We only need to use the same file system separator so that the test can run as expected.

This patch fixes the test by using the file system separator instead of operating system separator.

Thank you for taking the time to review.

Best Regards.

Progress

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

Issue

JDK-8231179: Investigate why tools/javac/options/BCPOrSystemNotSpecified.java fails on Window

Reviewers

Vicente Romero (@vicente-romero-oracle - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2004

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

Using diff file

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

…java fails on Window

bridgekeeper · 2021-01-08T13:34:23Z

👋 Welcome back lgxbslgx! 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 · 2021-01-08T13:35:28Z

@lgxbslgx 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.

mlbridge · 2021-01-08T13:38:02Z

Webrevs

vicente-romero-oracle · 2021-01-14T21:14:48Z

test/langtools/tools/javac/options/BCPOrSystemNotSpecified.java

@@ -206,7 +209,9 @@ private void prepareBCP(Path target) throws IOException {
                    Files.createDirectories(targetDir);
                    try (InputStream in = file.openInputStream()) {
                        String sourcePath = file.getName();
-                        int sepPos = sourcePath.lastIndexOf(fileSep);
+                        // Here, we should use file system separator instead of the operating system separator.
+                        String fileSystemSep = ((PathFileObject) file).getPath().getFileSystem().getSeparator();


what about using: System.getProperty("file.separator")?

@vicente-romero-oracle That would be incorrect.
That system property is for the default file system, and may not be the correct separator for a user-defined file system, as is possible with java.nio.file.FileSystem

@vicente-romero-oracle Explaining a bit more ... on Windows, the default file system separator is \ but we're dealing here with Path objects from the "internal" JRT file system, which uses / as a separator. That's why we have to be careful to use the right separator. On Unix/Linux/macOS, the separators are the same, which is how the test has passed on those platforms.

I see thanks for the clarification

jonathan-gibbons · 2021-01-14T21:33:21Z

test/langtools/tools/javac/options/BCPOrSystemNotSpecified.java

@@ -206,7 +209,9 @@ private void prepareBCP(Path target) throws IOException {
                    Files.createDirectories(targetDir);
                    try (InputStream in = file.openInputStream()) {
                        String sourcePath = file.getName();
-                        int sepPos = sourcePath.lastIndexOf(fileSep);
+                        // Here, we should use file system separator instead of the operating system separator.
+                        String fileSystemSep = ((PathFileObject) file).getPath().getFileSystem().getSeparator();


It should be possible to get the Path without having to cast to the internal PathFileObject type.

See https://docs.oracle.com/en/java/javase/15/docs/api/java.compiler/javax/tools/StandardJavaFileManager.html#asPath(javax.tools.FileObject)

@jonathan-gibbons Thanks for your suggestion. I have updated the code.

lgxbslgx · 2021-01-21T18:50:25Z

I find the windows-x64-build of the pre-submit-tests failed. I merge the code of the master branch to try to fix it.

bridgekeeper · 2021-02-18T22:15:08Z

@lgxbslgx This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

lgxbslgx · 2021-04-15T03:07:54Z

I merged the code of the master branch just now to see whether the tools/javac/options/BCPOrSystemNotSpecified.java passes the Pre-submit test. If so, maybe it is time for us to push this patch.

# Conflicts: # test/langtools/ProblemList.txt

lgxbslgx · 2021-04-19T04:32:46Z

I merged the master branch to solve the conflict. Thank you for reviewing.

vicente-romero-oracle

looks good to me

openjdk · 2021-04-23T19:45:02Z

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

8231179: Investigate why tools/javac/options/BCPOrSystemNotSpecified.java fails on Window

Reviewed-by: vromero

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

e08f506: 8265816: Handle new VectorMaskCast node for x86
bebfae4: 8264208: Console charset API
5aab160: 8265531: doc/building.md should mention homebrew install freetype
d8e638f: 8265794: Remove ProblemList-non-cds-mode
ac23870: 8265831: 8257831 broke Windows x86 build
8e31229: 8265327: Remove check_safepoint_and_suspend_for_native_trans()
c9b70c8: 8265240: runtime/Thread/SuspendAtExit.java needs updating
891f72f: 8265606: Reduce allocations in AdapterHandlerLibrary::get_adapter
bfc1cd8: 8264320: ShouldNotReachHere in Compile::print_inlining_move_to()
5db64c3: 8265268: Unify ReservedSpace reservation code in initialize and try_reserve_heap
... and 98 more: https://git.openjdk.java.net/jdk/compare/1ac25b8201479be51113ff657b9a87fa29a690e8...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@jonathan-gibbons, @vicente-romero-oracle) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

lgxbslgx · 2021-04-23T21:06:30Z

@vicente-romero-oracle Thank you for your review. Could I get your help to sponsor this patch?

/integrate

openjdk · 2021-04-23T21:07:40Z

@lgxbslgx
Your change (at version 40fa1b7) is now ready to be sponsored by a Committer.

vicente-romero-oracle · 2021-04-24T02:17:33Z

/sponsor

openjdk · 2021-04-24T02:18:55Z

@vicente-romero-oracle @lgxbslgx Since your change was applied there have been 113 commits pushed to the master branch:

d87a4c3: 8239596: PARAMETER annotation on receiver type does not cause error
52f9d22: 8265884: ProblemList compiler/codecache/jmx/PoolsIndependenceTest.java on macOS-X64
5aed446: 8265403: consolidate definition of CPU features
20a373a: 8265393: VM crashes if both -XX:+RecordDynamicDumpInfo and -XX:SharedArchiveFile options are specified
6803ab2: 8265880: ProblemList serviceability/dcmd/gc/RunFinalizationTest.java on Linux-X64
e08f506: 8265816: Handle new VectorMaskCast node for x86
bebfae4: 8264208: Console charset API
5aab160: 8265531: doc/building.md should mention homebrew install freetype
d8e638f: 8265794: Remove ProblemList-non-cds-mode
ac23870: 8265831: 8257831 broke Windows x86 build
... and 103 more: https://git.openjdk.java.net/jdk/compare/1ac25b8201479be51113ff657b9a87fa29a690e8...master

Your commit was automatically rebased without conflicts.

Pushed as commit 4b7f027.

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

lgxbslgx added 2 commits Jan 8, 2021

8231179: Investigate why tools/javac/options/BCPOrSystemNotSpecified.…

4934814

…java fails on Window

Modify copyright

d375cc0

openjdk bot added the rfr label Jan 8, 2021

openjdk bot added the compiler label Jan 8, 2021

vicente-romero-oracle reviewed Jan 14, 2021

View changes

jonathan-gibbons suggested changes Jan 14, 2021

View changes

lgxbslgx added 2 commits Jan 15, 2021

Use StandardJavaFileManager::asPath

aee1c4a

Merge branch 'master' into JDK-8231179

0cfaae6

Merge branch 'master' into JDK-8231179

a2887ee

Merge branch 'master' into JDK-8231179

40fa1b7

# Conflicts: # test/langtools/ProblemList.txt

vicente-romero-oracle approved these changes Apr 23, 2021

View changes

openjdk bot added the ready label Apr 23, 2021

openjdk bot added the sponsor label Apr 23, 2021

openjdk bot closed this Apr 24, 2021

openjdk bot added integrated and removed sponsor ready rfr labels Apr 24, 2021

lgxbslgx deleted the JDK-8231179 branch Apr 24, 2021

8231179: Investigate why tools/javac/options/BCPOrSystemNotSpecified.java fails on Window #2004

8231179: Investigate why tools/javac/options/BCPOrSystemNotSpecified.java fails on Window #2004

lgxbslgx commented Jan 8, 2021 •

edited by openjdk[bot] bot

bridgekeeper bot commented Jan 8, 2021

openjdk bot commented Jan 8, 2021

mlbridge bot commented Jan 8, 2021 •

edited

vicente-romero-oracle Jan 14, 2021

jonathan-gibbons Jan 14, 2021 •

edited

jonathan-gibbons Jan 14, 2021

vicente-romero-oracle Jan 15, 2021

jonathan-gibbons Jan 14, 2021

lgxbslgx Jan 15, 2021

lgxbslgx commented Jan 21, 2021

bridgekeeper bot commented Feb 18, 2021

lgxbslgx commented Apr 15, 2021

lgxbslgx commented Apr 19, 2021

vicente-romero-oracle left a comment

openjdk bot commented Apr 23, 2021 •

edited

lgxbslgx commented Apr 23, 2021

openjdk bot commented Apr 23, 2021

vicente-romero-oracle commented Apr 24, 2021

openjdk bot commented Apr 24, 2021

8231179: Investigate why tools/javac/options/BCPOrSystemNotSpecified.java fails on Window #2004

8231179: Investigate why tools/javac/options/BCPOrSystemNotSpecified.java fails on Window #2004

Conversation

lgxbslgx commented Jan 8, 2021 • edited by openjdk[bot] bot

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jan 8, 2021

openjdk bot commented Jan 8, 2021

mlbridge bot commented Jan 8, 2021 • edited

Webrevs

vicente-romero-oracle Jan 14, 2021

Choose a reason for hiding this comment

jonathan-gibbons Jan 14, 2021 • edited

Choose a reason for hiding this comment

jonathan-gibbons Jan 14, 2021

Choose a reason for hiding this comment

vicente-romero-oracle Jan 15, 2021

Choose a reason for hiding this comment

jonathan-gibbons Jan 14, 2021

Choose a reason for hiding this comment

lgxbslgx Jan 15, 2021

Choose a reason for hiding this comment

lgxbslgx commented Jan 21, 2021

bridgekeeper bot commented Feb 18, 2021

lgxbslgx commented Apr 15, 2021

lgxbslgx commented Apr 19, 2021

vicente-romero-oracle left a comment

openjdk bot commented Apr 23, 2021 • edited

lgxbslgx commented Apr 23, 2021

openjdk bot commented Apr 23, 2021

vicente-romero-oracle commented Apr 24, 2021

openjdk bot commented Apr 24, 2021

lgxbslgx commented Jan 8, 2021 •

edited by openjdk[bot] bot

mlbridge bot commented Jan 8, 2021 •

edited

jonathan-gibbons Jan 14, 2021 •

edited

openjdk bot commented Apr 23, 2021 •

edited