Skip to content

Integration Candidate COMBINED 2020-04-29 and 2020-05-06#83

Merged
astrogeco merged 12 commits intomasterfrom
integration-candidate
May 13, 2020
Merged

Integration Candidate COMBINED 2020-04-29 and 2020-05-06#83
astrogeco merged 12 commits intomasterfrom
integration-candidate

Conversation

@astrogeco
Copy link
Contributor

@astrogeco astrogeco commented May 8, 2020 •
edited
Loading

Describe the contribution
Integration Candidate combining

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

Expected behavior changes
See PRs

System(s) tested on
Bundle CI

Contributor Info - All information REQUIRED for consideration of pull request

@astrogeco astrogeco changed the title Integration candidate Integration Candidate: 2020-04-29 May 8, 2020
@skliper
Copy link
Contributor

skliper commented May 11, 2020

Did you mean to reference #58 or nasa/sample_app#58

@astrogeco
Copy link
Contributor Author

astrogeco commented May 11, 2020

Did you mean to reference #58 or nasa/sample_app#58

sample app#58, I can amend the commit

@astrogeco
Copy link
Contributor Author

astrogeco commented May 11, 2020

@ejtimmon looks like there are still some challenges with sample_app

See https://travis-ci.com/github/nasa/cFS/jobs/332204212

[ 81%] Building C object apps/sample_app/unit-test/CMakeFiles/sample_app-testrunner.dir/coveragetest/coveragetest_sample_app.c.o

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c: In function ‘Test_SAMPLE_NoopCmd_LengthFailure’:

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:475:33: error: passing argument 1 of ‘SAMPLE_ProcessGroundCommand’ from incompatible pointer type [-Werror=incompatible-pointer-types]

     SAMPLE_ProcessGroundCommand(&TestMsg);

                                 ^

In file included from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/sample_app_coveragetest_common.h:42:0,

                 from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:43:

/home/travis/build/nasa/cFS/apps/sample_app/fsw/src/sample_app.h:123:7: note: expected ‘CFE_SB_MsgPtr_t {aka union <anonymous> *}’ but argument is of type ‘SAMPLE_Noop_t * {aka struct <anonymous> *}’

 void  SAMPLE_ProcessGroundCommand(CFE_SB_MsgPtr_t Msg);

       ^~~~~~~~~~~~~~~~~~~~~~~~~~~

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c: In function ‘Test_SAMPLE_ResetCounters_LengthFailure’:

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:533:33: error: passing argument 1 of ‘SAMPLE_ProcessGroundCommand’ from incompatible pointer type [-Werror=incompatible-pointer-types]

     SAMPLE_ProcessGroundCommand(&TestMsg);

                                 ^

In file included from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/sample_app_coveragetest_common.h:42:0,

                 from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:43:

/home/travis/build/nasa/cFS/apps/sample_app/fsw/src/sample_app.h:123:7: note: expected ‘CFE_SB_MsgPtr_t {aka union <anonymous> *}’ but argument is of type ‘SAMPLE_ResetCounters_t * {aka struct <anonymous> *}’

 void  SAMPLE_ProcessGroundCommand(CFE_SB_MsgPtr_t Msg);

       ^~~~~~~~~~~~~~~~~~~~~~~~~~~

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c: In function ‘Test_SAMPLE_ProcessCC_LengthFailure’:

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:615:33: error: passing argument 1 of ‘SAMPLE_ProcessGroundCommand’ from incompatible pointer type [-Werror=incompatible-pointer-types]

     SAMPLE_ProcessGroundCommand(&TestMsg);

                                 ^

In file included from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/sample_app_coveragetest_common.h:42:0,

                 from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:43:

/home/travis/build/nasa/cFS/apps/sample_app/fsw/src/sample_app.h:123:7: note: expected ‘CFE_SB_MsgPtr_t {aka union <anonymous> *}’ but argument is of type ‘SAMPLE_Process_t * {aka struct <anonymous> *}’

 void  SAMPLE_ProcessGroundCommand(CFE_SB_MsgPtr_t Msg);

       ^~~~~~~~~~~~~~~~~~~~~~~~~~~

@astrogeco astrogeco mentioned this pull request May 13, 2020
Merged
@astrogeco astrogeco changed the title Integration Candidate: 2020-04-29 Integration Candidate COMBINED 2020-04-29 and 2020-05-06 May 13, 2020
This was referenced May 13, 2020
Merged
Merged
Merged
Merged
Merged
@astrogeco astrogeco force-pushed the integration-candidate branch from cba8806 to a577dfd Compare May 13, 2020 02:12
@astrogeco astrogeco mentioned this pull request May 13, 2020
Merged
@astrogeco astrogeco force-pushed the integration-candidate branch from d24630c to 5032e7c Compare May 13, 2020 13:37
@astrogeco astrogeco marked this pull request as ready for review May 13, 2020 13:49
@astrogeco astrogeco mentioned this pull request May 13, 2020
Merged
@astrogeco astrogeco merged commit a4345d8 into master May 13, 2020
@skliper skliper added this to the 6.8.0 milestone Jun 1, 2020
chillfig pushed a commit to chillfig/cFS that referenced this pull request Mar 17, 2022
@astrogeco
Merge pull request nasa#83 from jphickey/fix-53-init-all-local-bufs
0402e7b 
Fix nasa#53, initialize local variables
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.

3 participants

@astrogeco @skliper @jphickey