Skip to content

Integration Candidate 20191230#448

Merged
skliper merged 4 commits intomasterfrom
ic-20191230
Jan 9, 2020
Merged

Integration Candidate 20191230#448
skliper merged 4 commits intomasterfrom
ic-20191230

Conversation

@skliper
Copy link
Contributor

@skliper skliper commented Dec 31, 2019

Describe the contribution
Fix #415, Fix #429

Testing performed

  1. Checked out all IC 20191230 branches
  2. Built and ran cFS unit tests and OSAL coverage (vxworks and shared)
    1. All passed (although osal_timer_UT occasionally still fails due to a test issue)
  3. Make cmdUtils where cFS-GroundSystem expects it
    1. cd tools/cFS-GroundSystem/Subsystems/cmdUtil
    2. make
  4. Started Ground system
    1. python3 GroundSystem.py
  5. Enabled commands to 127.0.0.1
  6. Confirmed telemetry packets received
  7. Sent ES and TIME noop commands, confirmed noop message from cFS on Port 1
  8. Sent ES power on reset and observed cFS exit

Expected behavior changes
See related pull requests

System(s) tested on

  • cFS Dev Server 2
  • OS: Ubuntu 18.04
  • Versions: ic-20191230 branches

Additional context
N/A

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

jphickey and others added 4 commits November 21, 2019 09:52
@jphickey
Fix #415: Separate the CFE stubs from UT test cases
de7c761 
Build the CFE UT stub library separately from the test cases.
This moves the stub files into a separate ut-stubs directory,
and the library is now called "ut_cfe_core_stubs"

Note: Minor cleanup also done as part of moving.  Two stub
files were in the source tree but not being built or used
by any framework test config.  These were:
  ut_arinc653_stubs.c
  ut_configdata_stubs.c

These are now removed.  Also cleaned up some old macros/ifdefs
that were never enabled or used in the current tests.
Resolve pull #417 conflicts
182b640 
Removed conflicting files, not needed after #417 changes.
@skliper
Fix #429, Const string initialization
d1a1b35
CCB 20191218: Merge #417 #430
e5e5219 
Fix #415, #429
Reviewed and approved at 2019-12-18 CCB
@skliper skliper added this to the 6.8.0 milestone Jan 9, 2020
@skliper skliper merged commit e5e5219 into master Jan 9, 2020
@skliper skliper deleted the ic-20191230 branch January 10, 2020 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

Bootes

Development

Successfully merging this pull request may close these issues.

Fix missing const warning with -Wdiscarded-qualifiers enabled Build system needs to better separate the UT stub function from the UT test cases

2 participants

@skliper @jphickey