hijack: don't collect logger if SOF_LOGGING=none#1018
Merged
fredoh9 merged 1 commit intothesofproject:mainfrom Apr 7, 2023
Merged
hijack: don't collect logger if SOF_LOGGING=none#1018fredoh9 merged 1 commit intothesofproject:mainfrom
fredoh9 merged 1 commit intothesofproject:mainfrom
Conversation
SOF_LOGGING=none means no logger log. This condition must be checked before the other conditions. Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
paulstelian97
approved these changes
Apr 7, 2023
| if is_ipc4 && is_firmware_file_zephyr; then | ||
| local mtraceBin; mtraceBin=mtrace-reader.py | ||
| if [ "$SOF_LOGGING" != 'none' ] && is_ipc4 && is_firmware_file_zephyr; then | ||
| local mtraceBin; mtraceBin=mtrace-reader.py |
There was a problem hiding this comment.
Whitespace change: Good thing this isn't Python. Rest of the change isn't an issue so I can still approve.
Collaborator
There was a problem hiding this comment.
I hate unrelated whitespace fixes because they break git cherry-pick, merge, blame etc. but in this case the change is so close that git would conflict anyway.
marc-hb
added a commit
to marc-hb/sof-test
that referenced
this pull request
Apr 7, 2023
…ition Fixes warning found in https://github.com/thesofproject/sof-test/actions/runs/4635603962/jobs/8202801248?pr=1018 testing PR thesofproject#1018 See inline comments. Fixes commit 0ccb4c8 ("hijack.sh: more generic way to disable unknown $logfile shellcheck") Different shellcheck versions may warn about this fake definition differently but life is too short to compare them, just disable both SC2154 and SC2269 Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
approved these changes
Apr 7, 2023
Collaborator
marc-hb
left a comment
marc-hb
left a comment
There was a problem hiding this comment.
Fix for unrelated shellcheck warning in https://github.com/thesofproject/sof-test/actions/runs/4635603962/jobs/8202801248?pr=1018 submitted in separate PR #1020
fredoh9
pushed a commit
that referenced
this pull request
Apr 7, 2023
…ition Fixes warning found in https://github.com/thesofproject/sof-test/actions/runs/4635603962/jobs/8202801248?pr=1018 testing PR #1018 See inline comments. Fixes commit 0ccb4c8 ("hijack.sh: more generic way to disable unknown $logfile shellcheck") Different shellcheck versions may warn about this fake definition differently but life is too short to compare them, just disable both SC2154 and SC2269 Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
SOF_LOGGING=none means no logger log. This condition must be checked before the other conditions.