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 20191230 #448

Merged
merged 4 commits into from
Jan 9, 2020
Merged

Integration Candidate 20191230 #448

merged 4 commits into from
Jan 9, 2020

Commits on Nov 21, 2019

  1. Fix #415: Separate the CFE stubs from UT test cases

    Build the CFE UT stub library separately from the test cases.
    This moves the stub files into a separate ut-stubs directory,
    and the library is now called "ut_cfe_core_stubs"
    
    Note: Minor cleanup also done as part of moving.  Two stub
    files were in the source tree but not being built or used
    by any framework test config.  These were:
      ut_arinc653_stubs.c
      ut_configdata_stubs.c
    
    These are now removed.  Also cleaned up some old macros/ifdefs
    that were never enabled or used in the current tests.
    jphickey committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    de7c761 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2019

  1. Resolve pull #417 conflicts

    Removed conflicting files, not needed after #417 changes.
    skliper committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    182b640 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d1a1b35 View commit details
    Browse the repository at this point in the history
  3. CCB 20191218: Merge #417 #430

    Fix #415, #429
    Reviewed and approved at 2019-12-18 CCB
    skliper committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    e5e5219 View commit details
    Browse the repository at this point in the history