Update CFE unit tests after rebase of OSAL ticket 17

[skliper]

Previously, CFE ticket #63 was implemented which was based on the proposed unit test framework implemented within OSAL [cfs_osal:17].

The unit test framework has since been revisited and the related OSAL ticket has been rebased accordingly.

Unfortunately, this broke some items that had been done originally within trac #63. Trac 32 can no longer be rebased since it is merged in "development" already, so this ticket will fix the unit test breakage.

[skliper]

Imported from trac issue 72. Created by jphickey on 2015-06-23T12:47:58, last modified: 2019-03-05T14:57:55

[skliper]

Trac comment by jphickey on 2015-06-23 13:28:48:

NOTE Due to merge/rebase conflicts, this ticket will ALSO include all the changes for prior tickets #87 and #88.

This will result in a single branch that merges together all of the unit test fixes and produces a basically working CFE unit test again.

It is based on the current {{{ic-2015-05-20}}} which includes the CFE 6.4.2 changes.

[skliper]

Trac comment by jphickey on 2015-07-09 16:44:22:

== UPDATED AND REBASED ==

This change set has been rebased to the current development branch based off the newly-released version 6.4.2.

Commit [changeset:702387c] reflects the latest revision for review.

Note - To reduce possible merge conflicts, #87 and #97 are merged prior to this change set (they touch some of the same files).

[skliper]

Trac comment by jphickey on 2015-07-09 16:45:06:

This is included in the {{{ic-2015-07-14}}} integration candidate for testing

[skliper]

Trac comment by glimes on 2015-07-13 14:43:49:

Accept.

[skliper]

Trac comment by jphickey on 2015-07-15 13:49:19:

== REBASED AGAIN ==

Per the 2015-07-14 CCB review some other dependent change sets were approved (#87 and #97). Therefore this has been rebased again to the current "development" baseline that contains these change sets. This now makes it a standalone change set.

New/rebased commitid is: [changeset:49e4135]

(To anyone who as already reviewed, the change is the same, just the parent commit is different)

[skliper]

Trac comment by glimes on 2015-07-27 12:21:48:

Accept.

[skliper]

Trac comment by sduran on 2015-07-27 14:41:52:

Lots of changes to unit test code. It will be interesting to see how this merges with unit test work underway at JSC.

[skliper]

Trac comment by glimes on 2015-07-28 10:48:39:

Actually tinkered together the Grand Merge of the latest trac-22
branch with development, then the CCB review branch, then out
to the tip of the JPH Bleeding Edge.

The mechanical merge was easy (but not entirely automatic).

As I write this: the Bamboo plan tests it out and gives it
a GREEN status, with one exception in quarantine.

https://babelfish.arc.nasa.gov/bamboo/browse/CFS-CFSOSAL61/latest

The sole Quarantine item:

{{{
osal/src/unit-tests/osfilesys-test/ut_osfilesys_test.c:133: warning: implicit declaration of function 'UT_os_getfsinfo_test'
}}}

Now bear in mind that this is merging Joe's latest (which he has
not said is ready for prime time) with JSC's latest (which you have
not claimed to be ready for prime time).

So the fact that a mechanical merge does this well is surprisingly good.

The downside is that my builds are not compiling any of the VxWorks support
code (which I think your branch touches), and I think I see some new code
being introduced which my existing build scripts do not know to compile, so
there could be all sorts of issues.

My thinking is that as long as we have a known resolution to the mechanically
discoverable merge conflicts in our pocket, we will waste less time when
we eventually get down to the task of resolving any real conflicts.

[skliper]

Trac comment by glimes on 2015-07-30 15:12:44:

[changeset:49e4135 trac-72-cfe-ut-rebase-fixes] is included in [changeset:6ea42ba ic-2015-07-28]

[skliper]

Trac comment by glimes on 2015-09-08 12:58:44:

... somehow was not closed after the 07-28 integration was complete.

[skliper]

Trac comment by glimes on 2016-02-16 13:16:45:

Susie confirmed these tickets have been approved for CFE 6.5

[skliper]

Trac comment by jhageman on 2019-03-05 14:57:55:

Milestone renamed