Fixed ninja binary location logic to use ninja.BIN_DIR. #4655
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…c no longer works starting with python ninja package version 1.11.1.2
mwichmann
reviewed
Nov 25, 2024
testing/framework/TestSCons.py
Outdated
| @@ -1079,7 +1087,16 @@ def java_get_class_files(self, dir): | |||
| result.append(os.path.join(dirpath, fname)) | |||
| return sorted(result) | |||
|
|
|||
| def Qt_dummy_installation(self, dir: str='qt') -> None: | |||
| def ninja_binary(self): | |||
There was a problem hiding this comment.
Curious if this a method for efficiency reasons, or if it would be better as just a variable at a top level like is done with the path to Python?
There was a problem hiding this comment.
Good point.
I'll change to that and update the branch.
mwichmann
reviewed
Nov 25, 2024
| "scons: done reading SConscript files.\n" + \ | ||
| f"scons: {cap}ing targets ...\n" + \ | ||
| build_str + \ | ||
| term |
There was a problem hiding this comment.
A lot of this file is style stuff... I have a complete "black" reformat of the framework for when you feel enthused... actually "reviewing" it would be a bear though, so here it still sits. That line got turned into this, for example:
return (
"scons: Reading SConscript files ...\n"
+ read_str
+ "scons: done reading SConscript files.\n"
+ f"scons: {cap}ing targets ...\n"
+ build_str
+ term
)
mwichmann
reviewed
Nov 25, 2024
CHANGES.txt
Outdated
| - Update ninja tool to use ninja.BIN_DIR to find pypi packaged ninja binary. | ||
| python ninja package version 1.11.1.2 changed the location and previous | ||
| logic no longer worked. | ||
| - Added ninja_binary() method to TestSCons to centralize logic to find ninja binary |
There was a problem hiding this comment.
This looks okay to me (although see the question on the added method itself).
…tool loading logic. This fixes changes in this PR breaking JavaCommonTests because pypi's ninja module and SCons.Tool.ninja had the same name which python couldn't differentiate
mwichmann
added
Ninja
testsuite
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previous logic no longer works starting with python ninja package version 1.11.1.2
Contributor Checklist:
CHANGES.txtandRELEASE.txt(and read theREADME.rst).