From 78edacf1d979ec6169a0cf61067d567995aa9f4d Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Tue, 14 Apr 2020 15:28:23 -0400 Subject: [PATCH 1/2] Fix #19, Update coverage compile/link flag options OSAL now sets these as UT_COVERAGE_COMPILE_FLAGS, UT_COVERAGE_LINK_FLAGS. Building and linking the UT executable needs a corresponding update. --- unit-test/CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/unit-test/CMakeLists.txt b/unit-test/CMakeLists.txt index e101ce8..82a146d 100644 --- a/unit-test/CMakeLists.txt +++ b/unit-test/CMakeLists.txt @@ -62,10 +62,9 @@ foreach(SRCFILE ${LIB_SRC_FILES}) ${UNIT_SOURCE_FILE} ) - # Apply the UT_C_FLAGS to the units under test + # Apply the UT_COVERAGE_COMPILE_FLAGS to the units under test # This should enable coverage analysis on platforms that support this - set_target_properties(ut_${TESTNAME}_object PROPERTIES - COMPILE_FLAGS "${UT_C_FLAGS}") + target_compile_options(ut_${TESTNAME}_object PRIVATE ${UT_COVERAGE_COMPILE_FLAGS}) # For this object target only, the "override" includes should be injected # into the include path BEFORE any other include path. This is so the @@ -80,13 +79,11 @@ foreach(SRCFILE ${LIB_SRC_FILES}) $ ) - # This also needs to be linked with UT_C_FLAGS (for coverage) - set_target_properties(${TESTNAME}-testrunner PROPERTIES - LINK_FLAGS "${UT_C_FLAGS}") - + # This also needs to be linked with UT_COVERAGE_LINK_FLAGS (for coverage) # This is also linked with any other stub libraries needed, # as well as the UT assert framework target_link_libraries(${TESTNAME}-testrunner + ${UT_COVERAGE_LINK_FLAGS} ut_${UT_NAME}_stubs ut_${UT_NAME}_overrides ut_cfe-core_stubs From 7a2951df64c2f4035cc470bb050d5c8f5c4bfeab Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Fri, 1 May 2020 17:20:02 -0400 Subject: [PATCH 2/2] Increase version to 1.1.3, update readme, format version history --- README.md | 36 ++++++++++++++++++++++++------------ fsw/src/sample_lib_version.h | 2 +- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index e58b42a..8792aca 100644 --- a/README.md +++ b/README.md @@ -6,18 +6,30 @@ This sample library is a non-flight example library implementation for the cFS B sample_lib implements SAMPLE_Function, as an example for how to build and link a library in cFS. -## Version Notes - -- 1.1.2: DEVELOPMENT - - Added coverage test and a stub library to facilitate unit test - - Minor updates (see https://github.com/nasa/sample_lib/pull/16) -- 1.1.1: DEVELOPMENT - - Minor updates (see https://github.com/nasa/sample_lib/pull/14) -- **1.1.0 OFFICIAL RELEASE**: - - Minor updates (see https://github.com/nasa/sample_lib/pull/6) - - Released as part of cFE 6.7.0, Apache 2.0 -- **1.0.0a OFFICIAL RELEASE**: - - Released as part of cFE 6.6.0a, Apache 2.0 +## Version History + +#### Development Build: 1.1.3 + +- Coverage data `make lcov` includes the sample_lib code +- See https://github.com/nasa/sample_lib/pull/22 for more details + +#### Development Build: 1.1.2 + +- Added coverage test and a stub library to facilitate unit test +- Minor updates (see https://github.com/nasa/sample_lib/pull/16) + +#### Development Build: 1.1.1 + +- Minor updates (see https://github.com/nasa/sample_lib/pull/14) + +### ***OFFICIAL RELEASE: 1.1.0*** + +- Minor updates (see https://github.com/nasa/sample_lib/pull/6) +- Released as part of cFE 6.7.0, Apache 2.0 + +### ***OFFICIAL RELEASE: 1.0.0a*** + +- Released as part of cFE 6.6.0a, Apache 2.0 ## Known issues diff --git a/fsw/src/sample_lib_version.h b/fsw/src/sample_lib_version.h index be76a7c..3672f7f 100644 --- a/fsw/src/sample_lib_version.h +++ b/fsw/src/sample_lib_version.h @@ -32,7 +32,7 @@ #define SAMPLE_LIB_MAJOR_VERSION 1 #define SAMPLE_LIB_MINOR_VERSION 1 -#define SAMPLE_LIB_REVISION 2 +#define SAMPLE_LIB_REVISION 3 #define SAMPLE_LIB_MISSION_REV 0