Index: vectorcast/CCAST_.CFG
===================================================================
diff -u -r093d127f4e5acc9861a574c4f85addd4922a5f3d -rd40825a3f9a6e9a246f79233c6734d935711fcbf
--- vectorcast/CCAST_.CFG	(.../CCAST_.CFG)	(revision 093d127f4e5acc9861a574c4f85addd4922a5f3d)
+++ vectorcast/CCAST_.CFG	(.../CCAST_.CFG)	(revision d40825a3f9a6e9a246f79233c6734d935711fcbf)
@@ -1,90 +1,25 @@
-ASM_FUNCS_BEHAVE_AS_INLINES: FALSE
-ASSEMBLER_CMD: 
-AUTO_INCLUDE: 
-COMREADER_ENABLED: FALSE
-C_ALT_COMPILE_CMD: 
-C_ALT_EDG_FLAGS: 
-C_ALT_PREPROCESS_CMD: 
+COVERAGE_TYPE: Function
 C_COMPILER_CFG_SOURCE: BUILT_IN_TAG
 C_COMPILER_FAMILY_NAME: GNU_Native
 C_COMPILER_HIERARCHY_STRING: GNU Native_7.4_C
 C_COMPILER_OUTPUT_FLAG: -o
-C_COMPILER_PY_ARGS: 
 C_COMPILER_TAG: CUSTOM_GNU_C_74
 C_COMPILER_VERSION_CMD: gcc --version
 C_COMPILE_CMD: gcc -c -g
-C_COMPILE_CMD_FLAG: -c
-C_COMPILE_EXCLUDE_FLAGS: -o**
 C_DEBUG_CMD: gdb
-C_DEBUG_HELP_FILE: 
-C_DEFINE_FLAG: -D
 C_DEFINE_LIST: _VECTORCAST_ _HD_
 C_EDG_FLAGS: -w --gcc --gnu_version 70400 --define_macro='_Float128=float'
-C_EXECUTE_CMD: 
-C_EXEC_HELP_FILE: 
-C_INCLUDE_FLAG: -I
 C_LINKER_VERSION_CMD: ld --version
 C_LINK_CMD: gcc -g
 C_LINK_OPTIONS: -lm
 C_PREPROCESS_CMD: gcc -E -C
-C_PREPROCESS_FILE: 
-EXECUTABLE_EXTENSION: 
-MAX_VARY_RANGE: 20
-PRECOMPILE_CMD: 
-PRECOMPILE_EXT: 
-SBF_LOC_MEMBER_IN_NSP: DECL_NAMESPACE
-SBF_LOC_MEMBER_OUTSIDE_NSP: DECL_NAMESPACE
-SBF_LOC_NONMEMBER_IN_NSP: DECL_NAMESPACE
-SBF_LOC_NONMEMBER_OUTSIDE_NSP: DECL_NAMESPACE
-SOURCE_EXTENSION: .c
-SUBSTITUTE_CODE_FOR_C_FILE: FALSE
-VCAST_ALT_WB_METHOD: FALSE
 VCAST_ASSEMBLY_FILE_EXTENSIONS: s
-VCAST_ASSIGN_WITHOUT_COPY_CTOR: TRUE
-VCAST_AUTO_CLEAR_TEST_USER_CODE: FALSE
-VCAST_AVOID_COMMA_OPERATOR: FALSE
-VCAST_BUFFER_OUTPUT: FALSE
 VCAST_COLLAPSE_STD_HEADERS: COLLAPSE_SYSTEM_HEADERS
 VCAST_COMMAND_LINE_DEBUGGER: TRUE
-VCAST_COMPILER_SUPPORTS_CPP_CASTS: FALSE
-VCAST_COVERAGE_FOR_AGGREGATE_INIT: TRUE
-VCAST_C_FILE_EXTENSIONS: c
-VCAST_DISABLE_CPP_EXCEPTIONS: FALSE
-VCAST_DISABLE_STD_STRING_DETECTION: FALSE
 VCAST_DISABLE_STD_WSTRING_DETECTION: TRUE
-VCAST_DISABLE_TI_BITFIELD: FALSE
-VCAST_DISABLE_TI_STRING: FALSE
 VCAST_DISPLAY_UNINST_EXPR: FALSE
-VCAST_DUMP_BUFFER: FALSE
 VCAST_ENABLE_FUNCTION_CALL_COVERAGE: FALSE
-VCAST_ENVIRONMENT_FILES: 
-VCAST_ESCAPE_LINE_DIRECTIVES: FALSE
-VCAST_EXECUTE_WITH_STDIO: FALSE
-VCAST_EXECUTE_WITH_STDOUT: FALSE
-VCAST_FAR_STDIN_DATA: FALSE
-VCAST_FILE_INDEX: FALSE
-VCAST_FILE_PREFIX: 
-VCAST_FORCE_ELAB_TYPE_SPEC: TRUE
-VCAST_FORCE_NO_USERGLOBALS: FALSE
-VCAST_GH_INTEX_CMD: 
-VCAST_GH_INT_FILE: 
 VCAST_HAS_LONGLONG: TRUE
 VCAST_PREPROCESS_PREINCLUDE: $(VECTORCAST_DIR)/DATA/gnu_native/intrinsics.h
 VCAST_TYPEOF_OPERATOR: TRUE
-VCAST_USE_COMPOUND_FOR_BATCH: FALSE
-VCAST_USE_EDG_PREPROCESSOR: FALSE
-VCAST_USE_STATIC_MEMORY: FALSE
-VCAST_USE_STD_STRING: TRUE
-VCAST_USE_VCPP: FALSE
-VCAST_VXWORKS: FALSE
 WHITEBOX: YES
-TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/include/
-TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/source/
-TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/App/
-TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/App/Controllers/
-TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/App/Drivers/
-TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/App/Modes/
-TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/App/Services/
-TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/App/Tasks/
-TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/../../fwcommon/
-TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/../../common/