2015-02-12 Integration Candidate

[skliper]

This ticket will collect branches to be merged and tested based on the 2015-02-02 CCB.
Further details will be added in comments.

[skliper]

Imported from trac issue 18. Created by glimes on 2015-02-12T14:30:59, last modified: 2015-11-20T16:22:16

[skliper]

Trac comment by glimes on 2015-02-12 14:32:13:

CCB accepts #24 (common_types.h) for integration.

[skliper]

Trac comment by glimes on 2015-02-12 14:37:10:

CCB accepts #25 (cmake build system) for integration.

[skliper]

Trac comment by glimes on 2015-02-12 14:47:57:

CCB accepts #29 (test autonomy) for integration,
holding the integration for VxWorks and RTEMS results.
VxWorks impl can be tested at Ames.
RTEMS to be verified by Joe.

[skliper]

Trac comment by glimes on 2015-02-12 14:53:02:

CCB accepts #30 (fix warnings) for integration.

[skliper]

Trac comment by glimes on 2015-02-12 14:57:24:

CCB holds #32 (free-run counter) as it needs further discussion.

[skliper]

Trac comment by glimes on 2015-02-12 15:01:03:

CCB accepts #33 (API versioning) for integration.

[skliper]

Trac comment by glimes on 2015-02-12 15:09:43:

CCB accepts #34 (Error codes and strings) for integration.

[skliper]

Trac comment by glimes on 2015-02-12 15:14:08:

CCB accepts #39 (OS_PEND and OS_CHECK) for integration.

[skliper]

Trac comment by glimes on 2015-02-12 15:48:56:

Merge constructed and staged to Babelfish for testing

[changeset:f22ae86] ic-trac-18-2015-0212

This is a preliminary merge: notably, it does not yet contain the VxWorks and RTEMS updates for #29. The actual Git Commit ID number will be different when those updates are included.

(Note: since we do not yet have a continuous integration server that automagically picks up "ic-*" branches and hands back test results on a silver platter, there will be a short delay while we run tests by hand.)

[skliper]

Trac comment by glimes on 2015-02-26 16:41:12:

Preliminary merge noted above was used to refine build-and-test scripts, with results compared between 4.1.1 release, merge built with old build system, and merge built with new build system. Results are acceptable in that all tests currently failing, also fail in the 4.1.1 release.

''Achieving '''all unit tests pass''' is now a priority but does not gate this task.''

RTEMS and VxWorks edits for Trac #29 added (see [changeset:d11c5cc]) and the final merge (see [changeset:5aae372]). Test results for 32-bit X86 Linux were reviewed and are still acceptable (adding RTEMS and VxWorks changes did not perturb Linux/Posix code).

Unit tests were successfully built for RTEMS (in combination with some unit test edits not included in this merge). One selected test program was successfully run in an RTEMS environment (under QEMU), with acceptable results.

The code was manually tested on a PowerPC running VxWorks (which required a number of unit test edits not included in this merge), and again all of the test results were acceptable.

The development branch marker is hereby advanced to change set [changeset:5aae372], indicating that this is now the baseline version of the code to be used for future development branches.