Fix #196, Fix timer-test to be able to use OS_MAX_TIMERS value#490
Merged
astrogeco merged 2 commits intonasa:integration-candidatefrom Jul 1, 2020
Conversation
Contributor
Author
jphickey
requested changes
Jun 5, 2020
Contributor
jphickey
left a comment
jphickey
left a comment
There was a problem hiding this comment.
Minor change request.
Just to confirm - did you build and run this test with OS_MAX_TIMERS set to something less than 4 to confirm it works as expected?
src/tests/timer-test/timer-test.c
Outdated
| OS_time_t EndTime; | ||
| uint32 TimerStart[NUMBER_OF_TIMERS]; | ||
| uint32 TimerInterval[NUMBER_OF_TIMERS]; | ||
|
|
Contributor
There was a problem hiding this comment.
This looks odd - variable declared without initializer and then defined with initializer. Possibly a remnant change? Should remove this addition.
Contributor
Author
There was a problem hiding this comment.
This was a typo. Fixed.
Contributor
Author
|
@jphickey Yes, I tested it with less than 4 timers, etc. and it worked as expected. I'm pushing the other change now. |
astrogeco
added
CCB:Ready
Contributor
|
CCB-20200624 APPROVED |
astrogeco
added
the
CCB:Approved
jphickey
pushed a commit
to jphickey/osal
that referenced
this pull request
Aug 10, 2022
Integration Candidate 20200121
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
4 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.
Fix #196, Fix timer-test to be able to use OS_MAX_TIMERS value
Describe the contribution
Changed timer-test to be able to use OS_MAX_TIMERS value on top of the hard-coded NUMBER_OF_TIMERS value. This will allow the test to be functional even if the OS_MAX_TIMERS value is reconfigured.
Testing performed
Steps taken to test the contribution:
System(s) tested on
cFS Dev Server
OS: Ubuntu 18.04
Versions: OSAL 5.0.11.0
Contributor Info - All information REQUIRED for consideration of pull request
Yasir Majeed Khan
NASA GSFC/Emergent Space