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: 2020-05-20 #91

Merged
merged 9 commits into from
May 29, 2020
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented May 27, 2020

Describe the contribution

Combines:

  1. Integration candidate: 2020-05-20 PSP#166
  2. Integration Candidate 2020-05-20 osal#482
  3. Integration candidate: 2020-05-20 cFS-GroundSystem#94
  4. Integration Candidate: 2020-05-20 to_lab#43
  5. Integration Candidate: 2020-05-20 sample_lib#24
  6. Integration Candidate: 2020-05-20 sch_lab#41
  7. Integration Candidate: 2020-05-20 tblCRCTool#18
  8. Integration Candidate: 2020-05-20 elf2cfetbl#44

And

Fix #88

Testing performed
Bundle CI - https://travis-ci.com/github/nasa/cFS/builds/168824126

Expected behavior changes
See PRs for submodules above
PR #89

System(s) tested on
Ubuntu: Bionic

Additional context
See PRs

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman, NASA-GSFC
See PRs for other contributors

@astrogeco
Copy link
Contributor Author

@lbleier-GSFC can you help me out with some of the userguide doxygen errors showing up on Travis?

@astrogeco
Copy link
Contributor Author

astrogeco commented May 28, 2020

@skliper and @jphickey Unit test no. 52, osal-core-test, is hanging with OMIT_DEPRECATED=TRUE

@jphickey
Copy link
Contributor

@skliper and @jphickey Unit test no. 52, osal-core-test, is hanging with OMIT_DEPRECATED=TRUE

I pulled the integration-candidate and re-ran locally and everything worked, so I'm hoping this was just some sort of Travis anomaly. The other build was passing that test but then failing due to a doxygen warning. I pushed a hotfix to correct that.

@jphickey
Copy link
Contributor

This time around it is failing on BUILDTYPE=release OMIT_DEPRECATED=false combination. Unfortunately I can't seem to make it fail locally for me. Still looking into it... if anyone else is able to pull the IC and run it, would be helpful to get more data points to figure out what is the difference that makes this work/not work.

@jphickey
Copy link
Contributor

OK - merge fix in bef86a7 may have resolved the issue with the osal-core-test. (while I couldn't replicate the same issue, I did see a different issue when looking at my local logs, which was possibly related).

The next issue is regarding the startup script and is related to nasa/osal#461 and nasa/PSP#163 ... right now we've got one without the other which is causing the problem. If we merge nasa/osal#461 should get fixed.

@astrogeco astrogeco marked this pull request as ready for review May 29, 2020 22:51
@astrogeco astrogeco merged commit d80daf5 into master May 29, 2020
@skliper skliper added this to the 6.8.0 milestone Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Code style update - only inline empty functions
3 participants