CCB 20191218: Merge #319

Fix #297
Reviewed and approved at 2019-12-18 CCB

src/unit-test-coverage/portable/coveragetest-posixfile.c

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019, United States government as represented by the
+ * administrator of the National Aeronautics Space Administration.
+ * All rights reserved. This software was created at NASA Goddard
+ * Space Flight Center pursuant to government contracts.
+ *
+ * This is governed by the NASA Open Source Agreement and may be used,
+ * distributed and modified only according to the terms of that agreement.
+ */
+
 /*
  * Filename: osapi_testcase_common.c
  *
@@ -21,11 +31,11 @@
 
 #include "ut-osfileapi.h"
 
-#include <overrides/stdio.h>
-#include <overrides/stdlib.h>
-#include <overrides/unistd.h>
-#include <overrides/fcntl.h>
-#include <overrides/sys/stat.h>
+#include <OCS_stdio.h>
+#include <OCS_stdlib.h>
+#include <OCS_unistd.h>
+#include <OCS_fcntl.h>
+#include <OCS_stat.h>
 
 #define OSAPI_TEST_FUNCTION_RC(func,exp) \
 { \

src/unit-test-coverage/portable/coveragetest-posixgettime.c

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019, United States government as represented by the
+ * administrator of the National Aeronautics Space Administration.
+ * All rights reserved. This software was created at NASA Goddard
+ * Space Flight Center pursuant to government contracts.
+ *
+ * This is governed by the NASA Open Source Agreement and may be used,
+ * distributed and modified only according to the terms of that agreement.
+ */
+
 /*
  * Filename: osapi_testcase_common.c
  *
@@ -19,7 +29,7 @@
 #include <osapi.h>
 #include <os-impl.h>
 
-#include <overrides/time.h>
+#include <OCS_time.h>
 
 #define OSAPI_TEST_FUNCTION_RC(func,exp) \
 { \

src/unit-test-coverage/portable/coveragetest-posixio.c

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019, United States government as represented by the
+ * administrator of the National Aeronautics Space Administration.
+ * All rights reserved. This software was created at NASA Goddard
+ * Space Flight Center pursuant to government contracts.
+ *
+ * This is governed by the NASA Open Source Agreement and may be used,
+ * distributed and modified only according to the terms of that agreement.
+ */
+
 /*
  * Filename: osapi_testcase_common.c
  *
@@ -19,10 +29,10 @@
 #include <osapi.h>
 #include <os-impl.h>
 
-#include <overrides/stdlib.h>
-#include <overrides/unistd.h>
-#include <overrides/fcntl.h>
-#include <overrides/errno.h>
+#include <OCS_stdlib.h>
+#include <OCS_unistd.h>
+#include <OCS_fcntl.h>
+#include <OCS_errno.h>
 
 #include "ut-osfileapi.h"
 

src/unit-test-coverage/posix/modules/CMakeLists.txt

@@ -1,3 +1,13 @@
+#
+# Copyright (c) 2019, United States government as represented by the
+# administrator of the National Aeronautics Space Administration.
+# All rights reserved. This software was created at NASA Goddard
+# Space Flight Center pursuant to government contracts.
+#
+# This is governed by the NASA Open Source Agreement and may be used,
+# distributed and modified only according to the terms of that agreement.
+#
+
 # --------------------------------------
 # OSAL SHARED LAYER FOR COVERAGE TESTING
 # --------------------------------------
@@ -12,7 +22,8 @@
 # - UT_C_FLAGS are enabled to include any code coverage instrumentation 
 
 # the "overrides" dir contains empty versions of the C-library include files.
-include_directories(BEFORE ${OSALCOVERAGE_SOURCE_DIR}/ut-stubs/inc/overrides)
+include_directories(${OSALCOVERAGE_SOURCE_DIR}/ut-stubs/inc)
+include_directories(${OSALCOVERAGE_SOURCE_DIR}/ut-stubs/override_inc)
 
 foreach(MODULE ${MODULE_LIST})
  if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/ut-${MODULE}.c)
@@ -21,4 +32,4 @@ foreach(MODULE ${MODULE_LIST})
  endif ()
 endforeach()
 
-
+

src/unit-test-coverage/posix/modules/src/ut-osapi.c

@@ -1,5 +1,14 @@
+/*
+ * Copyright (c) 2019, United States government as represented by the
+ * administrator of the National Aeronautics Space Administration.
+ * All rights reserved. This software was created at NASA Goddard
+ * Space Flight Center pursuant to government contracts.
+ *
+ * This is governed by the NASA Open Source Agreement and may be used,
+ * distributed and modified only according to the terms of that agreement.
+ */
+
 /* pull in the OSAL configuration */
-#include "stub-map-to-real.h"
 #include "osconfig.h"
 
 /*