Integrate with 6.5 #24
Conversation
* Initial baseline for ECI code Changes from repo start: * Add Travis CI pipeline to run unit tests and verify example apps build * Added checksum to event msgs * Updated macro names to remove last traces of SIL naming convention * Renamed macros to standardize naming (see issue #3) * Updated documentation to add into on getting started using examples
Fixed example apps based on 6.6 changes.
This was a big commit to move around some configurations in the 6.5 ECI to make it consistant to how we build 6.6. Since 6.5 uses makefiles rather than cmake, we need to do some extra stuff to get everything where we want it.
|
@BaldBeacon Will review once checks are passing. Looks like unit tests haven't been updated yet. |
|
I think we might want to run the unit tests under CFE 6.6 as well as 6.5. What do you think? Handle here or in separate PR? Also, can you clarify your plan? master has the 6.5 version of ECI but these changes are coming from an integrate-with-6.5 branch... are you planning to open a PR for the cfe-6.6 branch into master after this? |
I'm still looking for a standard way to write unit tests with UT assert matching what's expected with the cFE 6.6 cmake system. I was hoping those could be written at a future time when I know more about how UT was expected to work with non-cfe core apps. The plan was to use this branch as an integration step between cFE 6.5 and cFE 6.6. Since we determined ECI should support both I thought it was fitting to include this into the cFE 6.6 branch to eventually be merged into master. |
|
Perhaps open an issue on the CFE/CFS repo requesting some documentation on the changes to the UT framework and/or an example implementation of some unit tests in one of the apps they include? Also, perhaps open an issue here documenting the need to run the unit tests under 6.6 (and link to the CFE/CFS UT issue) to be handled later? and then we'll merge this PR?
What other steps need to be completed before we could merge 6.6 into master? |
I've opened an issue #25 to address the documentation of the ECI and an issue in the cFS repo nasa/cFS#4 to gather more information on how to approach #25. This issue will most likely not be answered until we get more information on how to do the UT testing in 6.6.
ECI should be functionally ready for both cFE 6.5 and 6.6 following this MR. Next we should expect a separate MR to merge the cfe-6.6 branch into master. |
This commit merges the code in the master branch with the cfe 6.6 to make both compatible.