Skip to content
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

Integration candidate 2019-10-09 #378

Merged
merged 4 commits into from
Oct 23, 2019
Merged

Integration candidate 2019-10-09 #378

merged 4 commits into from
Oct 23, 2019

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Oct 15, 2019

Describe the contribution
Integration candidate for pull requests approved at 2019-10-09 CCB
Covers the following pull requests:
#27 - Ensure table naming consistent across CPUs
#367 - Fix infinite loop when gz file is truncated
#369 - Update obj creation failure requirement

Testing performed
Build code for native host (SIMULATION=native) with unit test enabled
Execute CFE core, issued various test commands from cmdUtil
Execute all unit tests and confirm passage.

Expected behavior changes
None

System(s) tested on:
Ubuntu 18.04.2 LTS 64-bit

Additional context
NA

Contributor Info
Joseph Hickey, Vantage Systems, Inc.

jphickey and others added 4 commits October 8, 2019 14:39
To ensure consistency in the size of the CFE_TBL_FileHdr_t struct,
this should be constrained to use only mission-scope definitions.

Also simplifies the structure definitions by _NOT_ padding strings
out to 32 bit multiples.  The default size of the strings are
already 32 bit multiples so this is just unnecessary complexity.
There is also no major issue if not 32 bit aligned, as the
compiler will add it automatically where needed.

Add a note in the related cfe_mission_cfg.h descriptions to
affected values, that these should be kept as a multiple of 4
to maintain alignment.

Updated for 2019-09-16 code review:
 - Added compile-time verification that the configuration
   directives are actually multiples of 4.
Merge branches 'p27', 'p367' and 'p369' for integration
@jphickey
Copy link
Contributor Author

Re-validated branch by re-building, executing unit tests, and sanity check of CFE core execution. All looks fine.

@jphickey jphickey merged commit 777f20a into master Oct 23, 2019
@jphickey jphickey deleted the ic-ccb-20191009 branch October 23, 2019 20:10
@skliper skliper added this to the 6.8.0 milestone Oct 25, 2019
@skliper skliper added the CCB:Approved Indicates code review and approval by community CCB label Oct 31, 2019
@skliper
Copy link
Contributor

skliper commented Oct 31, 2019

CCB 20191023 - Reviewed and approved

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants