-
Notifications
You must be signed in to change notification settings - Fork 78
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
CODETOOLS-7903317: Fix code to compile extra property definitions #122
CODETOOLS-7903317: Fix code to compile extra property definitions #122
Conversation
👋 Welcome back jjg! A progress list of the required criteria for merging this PR into |
@jonathan-gibbons this pull request can not be integrated into git checkout jtreg.7903317.compile-extra-prop-defns
git fetch https://git.openjdk.org/jtreg master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push |
Webrevs
|
test/extra-props/comments/Test1.java
Outdated
// this test should be executed | ||
} | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extra trailing space
@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:
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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
@@ -221,6 +223,9 @@ private List<String> compile(JDK jdk, Path classDir, SearchPath classpath, | |||
} | |||
|
|||
if (needCompilation) { | |||
if (trace) { | |||
System.err.println("Compiling extra property definition files: " + javacArgs); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you also log why the compilation was needed? i.e. when setting needCompilation, log sf and cf.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will investigate, as a separate RFE
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/integrate |
Going to push as commit 77650ff. |
@jonathan-gibbons Pushed as commit 77650ff. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Please review a fairly simple update to eliminate false positives in comments when looking for the name of the class in a Java source file.
The fix addresses a performance issue when running tests, because the "extra property definition" files were compiled every time jtreg was run, instead of as needed, which is the intent.
The fix is to ignore comments in the source code. The code to do this is copied from equivalent functionality in the langtools
ToolBox
class, which has been in use for many years.The existing tests for "extra property definition" files have been extended with a test case to ensure that the false positives no longer occur and that the files are not recompiled unnecessarily.
Minor style issues in the main source file have also been fixed.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jtreg pull/122/head:pull/122
$ git checkout pull/122
Update a local copy of the PR:
$ git checkout pull/122
$ git pull https://git.openjdk.org/jtreg pull/122/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 122
View PR using the GUI difftool:
$ git pr show -t 122
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jtreg/pull/122.diff