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.

Sign up for GitHub

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

Jump to bottom

Fix #39, Improve CI testing #40

Merged
merged 1 commit into from
Mar 23, 2020
Merged

Fix #39, Improve CI testing #40

merged 1 commit into from
Mar 23, 2020

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Jan 8, 2020

Describe the contribution
Fixes #39

Testing performed
See CI results

Expected behavior changes
Better CI testing coverage

System(s) tested on
CI

Additional context
Jobs will fail until issues are resolved.

Contributor Info
Jacob Hageman - NASA/GSFC

@skliper skliper force-pushed the fix39-improve-ci branch 2 times, most recently from e283669 to a917599 Compare January 8, 2020 16:27
@skliper
Copy link
Contributor Author

skliper commented Jan 15, 2020

This type of hack isn't necessary - just create a file native_osconfig.h that contains the overrides (in this case just #define OSAL_DEBUG_PERMISSIVE_MODE) and it will get pulled in when building with SIMULATION=native.

I'd prefer to avoid duplicating all the settings in osconfig.h in a native_osconfig.h, is that what this would mean? I'd much rather just change the setting needed for CI, which is what this does.

@skliper
Copy link
Contributor Author

skliper commented Jan 15, 2020

Note we've got an open ticket for PERMISSIVE/native "nicer" behavior. This would be my preferred solution.

@jphickey
Copy link
Contributor

I'd prefer to avoid duplicating all the settings in osconfig.h in a native_osconfig.h, is that what this would mean? I'd much rather just change the setting needed for CI, which is what this does.

No - both files are used. The default_osconfig.h file provides the basis config, and the native_osconfig.h only has the additional platform-specific options. It only needs to have the one line:

#define OSAL_DEBUG_PERMISSIVE_MODE

@skliper
Copy link
Contributor Author

skliper commented Jan 15, 2020

I'd prefer to avoid duplicating all the settings in osconfig.h in a native_osconfig.h, is that what this would mean? I'd much rather just change the setting needed for CI, which is what this does.

No - both files are used. The default_osconfig.h file provides the basis config, and the native_osconfig.h only has the additional platform-specific options. It only needs to have the one line:

#define OSAL_DEBUG_PERMISSIVE_MODE

Is that the preferred solution to making SIMULATION=native use permissive mode (related to nasa/cFE#358)? If so then it sounds good to me.

@skliper
Copy link
Contributor Author

skliper commented Jan 15, 2020

Note this depends on nasa/cFE#479, nasa/cFE#463, nasa/cFE#462 and some jobs will fail until warnings/issues are fixed.

@skliper
Copy link
Contributor Author

skliper commented Jan 21, 2020

See also nasa/cFE#358 for PERMISSIVE mode when SIMULATION=native

@skliper
Copy link
Contributor Author

skliper commented Jan 21, 2020

CCB 20200115 - discussed and presented tests. This pull will require special handling, since some tests in the matrix will break. Suggest rebasing this on top of IC branches until fixed (and to identify latest errors).

This was referenced Jan 21, 2020
Closed
Merged
Closed
@skliper
Copy link
Contributor Author

skliper commented Jan 23, 2020

Current issues:

@skliper
Copy link
Contributor Author

skliper commented Jan 28, 2020

Rebased on latest master (after ic 20200121 merge)

@skliper
Copy link
Contributor Author

skliper commented Jan 31, 2020 •
edited
Loading

Once nasa/cFE#505 is merged, can remove the sed "hack".

This was referenced Feb 12, 2020
Merged
Merged
@skliper
Copy link
Contributor Author

skliper commented Mar 17, 2020

All PASSED!!! Let's get this checked in asap!!

@skliper skliper added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Mar 17, 2020
@astrogeco astrogeco mentioned this pull request Mar 18, 2020
Merged
@astrogeco
Copy link
Contributor

CCB 20200318 - Approved.

@astrogeco astrogeco added CCB - 20200318 CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Mar 18, 2020
@astrogeco astrogeco changed the base branch from master to integration-candidate March 23, 2020 17:04
@astrogeco astrogeco merged commit d4bcfcf into nasa:integration-candidate Mar 23, 2020
@astrogeco astrogeco mentioned this pull request Mar 23, 2020
Merged
@skliper skliper added this to the 6.8.0 milestone Jun 1, 2020
@skliper skliper deleted the fix39-improve-ci branch January 28, 2021 23:01
chillfig pushed a commit to chillfig/cFS that referenced this pull request Mar 17, 2022
@jphickey
Fix nasa#40, update traverse history/write file
045c739 
- rename the function to better indicate what it does
- do not discard the part of the output that has EID/TSN/CC information
- do not pass the return value of snprintf directly to write(), use strlen()
- simplify the code
chillfig pushed a commit to chillfig/cFS that referenced this pull request Mar 17, 2022
@astrogeco
Merge pull request nasa#174 from jphickey/fix-40-writefile
fe02332 
Fix nasa#40, update traverse history/write file
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
CCB:Approved Indicates code review and approval by community CCB enhancement
Projects
None yet
Milestone
Bootes
Development

Successfully merging this pull request may close these issues.

Improve Travis CI testing
3 participants
@skliper @jphickey @astrogeco