multiple-pipeline-capture.sh: fix recent set -e related regression #521
Conversation
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
Fixes 202507f ("multiple-pipeline: fix set -e compatibility and add it") that didn't pay attention to the fact that sof-process-state.sh returns 2 when there is no process match and broke the test when there are only aplay or only arecord commands but not both at the same time. This regression was observed (among others) at: https://sof-ci.01.org/linuxpr/PR2565/build4887/devicetest/?model=APL_UP2_NOCODEC&testcase=multiple-pipeline-capture Also fixes more minor set -e compatibility issues. I missed the failure in https://sof-ci.01.org/softestpr/PR497/build372/devicetest/?model=APL_UP2_NOCODEC&testcase=multiple-pipeline-capture because it was reported as "N/A" and not FAIL because Jenkins interprets an exit status '2' as N/A. I should have paid more attention. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This was referenced Nov 18, 2020
aiChaoSONG
suggested changes
Nov 18, 2020
| pgrep -a arecord | ||
| pkill -9 aplay | ||
| pkill -9 arecord | ||
| ) |
There was a problem hiding this comment.
how about ! pgrep -a aplay || pkill -9 aplay, I think this should be compatible with set -e. the (set +e ...) looks like some hack.
Collaborator
Author
There was a problem hiding this comment.
I think this a good idea and better code however I don't think it's worth delaying this very urgent fix and I don't think (set +e ...) is a hack at all
Is it enough if I promise to submit a follow up commit with your change ASAP after this?
There was a problem hiding this comment.
@marc-hb sure, this is already good enough
Collaborator
Author
There was a problem hiding this comment.
how about ! pgrep -a aplay || pkill -9 aplay
Collaborator
Author
|
I inspected https://sof-ci.01.org/softestpr/PR521/build405/devicetest/?model=APL_UP2_HDA&testcase=multiple-pipeline-capture which is N/A and it looks OK. This test is PASS on every other platform. |
marc-hb
added a commit
to marc-hb/sof-test
that referenced
this pull request
Nov 18, 2020
... because its normal output is typically discarded. This would have avoided regression 202507f / thesofproject#497 fixed by thesofproject#521. This could help with other multi pipelines issues. Also add a documentation header so not everyone has to read the entire code. Also add a warning about the massive copy/paste across multiple-pipeline-playback and multiple-pipeline-capture (these are the heaviest sof-process-state users). Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
added a commit
to marc-hb/sof-test
that referenced
this pull request
Nov 18, 2020
As suggested by Chao in thesofproject#521 Also remove no-op exit $? on the last line. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
added a commit
to marc-hb/sof-test
that referenced
this pull request
Nov 18, 2020
... because its normal output is typically discarded. This would have avoided regression 202507f / thesofproject#497 fixed by thesofproject#521. This could help with other multi pipelines issues. Also add a documentation header so not everyone has to read the entire code. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
added a commit
to marc-hb/sof-test
that referenced
this pull request
Nov 23, 2020
As suggested by Chao in thesofproject#521 Also remove no-op exit $? on the last line. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
added a commit
that referenced
this pull request
Nov 24, 2020
As suggested by Chao in #521 Also remove no-op exit $? on the last line. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
added a commit
to marc-hb/sof-test
that referenced
this pull request
Dec 1, 2020
... because its normal output is typically discarded. This would have avoided regression 202507f / thesofproject#497 fixed by thesofproject#521. This could help with other multi pipelines issues. Also add a documentation header so not everyone has to read the entire code. When a process is not found just say so. No need for guesses and interpretations. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
xiulipan
pushed a commit
that referenced
this pull request
Dec 1, 2020
... because its normal output is typically discarded. This would have avoided regression 202507f / #497 fixed by #521. This could help with other multi pipelines issues. Also add a documentation header so not everyone has to read the entire code. When a process is not found just say so. No need for guesses and interpretations. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Fixes 202507f ("multiple-pipeline: fix set -e compatibility and add
it") that didn't pay attention to the fact that sof-process-state.sh
returns 2 when there is no process match and broke the test when there
are only aplay or only arecord commands but not both at the same time.
This regression was observed (among others) at:
https://sof-ci.01.org/linuxpr/PR2565/build4887/devicetest/?model=APL_UP2_NOCODEC&testcase=multiple-pipeline-capture
Also fixes more minor set -e compatibility issues.
I missed the failure in
https://sof-ci.01.org/softestpr/PR497/build372/devicetest/?model=APL_UP2_NOCODEC&testcase=multiple-pipeline-capture
because it was reported as "N/A" and not FAIL because Jenkins interprets
an exit status '2' as N/A. I should have paid more attention.
Signed-off-by: Marc Herbert marc.herbert@intel.com