Bringing Develop up to Master.

.codecov.yml

@@ -0,0 +1,6 @@
+#======================================================================
+#
+coverage:
+  range: 60...90
+  round: down
+  precision: 2

.travis.yml

@@ -46,7 +46,7 @@ before_install:
   - |
       if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
           brew update
-          brew install gcc6
+          brew install gcc@6
       fi
   - |
       if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
@@ -61,19 +61,25 @@ script:
   - |
       if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
           export LD_LIBRARY_PATH=${PWD}/schemes/check/src/check-build
-      elif [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
+          make test
+      fi
+  - |
+      if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
           export DYLD_LIBRARY_PATH=${PWD}/schemes/check/src/check-build
+          ctest
+      fi
+  - |
+      if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
+          make clean
+          alias gcov="/usr/bin/gcov-6"
+          cmake -DCMAKE_BUILD_TYPE=Coverage .. && make coverage
+      fi
+
+after_success:
+  - |
+      if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
+          bash <(curl -s https://codecov.io/bash)
       fi
-      make test
-#  - |
-#      if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
-#          make clean
-#          cmake -DCMAKE_BUILD_TYPE=Coverage .. && make coverage
-#          bash <(curl -s https://codecov.io/bash)
-#      fi
-#
-#after_success:
-#  - coveralls --exclude lib --exclude tests --gcov-options '\-lp'
 
 #======================================================================
 # Notifications

CMakeLists.txt

@@ -60,9 +60,6 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
 # Enable code coverage
 if(CMAKE_COMPILER_IS_GNUCC AND (CMAKE_BUILD_TYPE STREQUAL "Coverage"))
     include(code_coverage)
-    setup_target_for_coverage(coverage
-                              "src/atm_drv ${CMAKE_SOURCE_DIR}/tests/suite_DUMMY.xml"
-                              coverage)
     list(APPEND LIBS "gcov")
 endif()
 

README.md

@@ -2,7 +2,11 @@
 [GMTB](http://www.dtcenter.org/GMTB/html/) Common Community Physics Package
 (CCPP), including the Interoperable Physics Driver (IPD).
 
-[![Build Status](https://travis-ci.com/NCAR/gmtb-ccpp.svg?branch=master)](https://travis-ci.com/NCAR/gmtb-ccpp)
+| Branch  | Linux/MacOS Build | Coverage |
+|---      |---                |---       |
+| Master  | [![Build Status](https://travis-ci.org/NCAR/gmtb-ccpp.svg?branch=master)](https://travis-ci.org/NCAR/gmtb-ccpp)  | [![Coverage Status](https://codecov.io/github/NCAR/gmtb-ccpp/coverage.svg?branch=master)](https://codecov.io/github/NCAR/gmtb-ccpp) |
+| Develop | [![Build Status](https://travis-ci.org/NCAR/gmtb-ccpp.svg?branch=develop)](https://travis-ci.org/NCAR/gmtb-ccpp) | [![Coverage Status](https://codecov.io/github/NCAR/gmtb-ccpp/coverage.svg?branch=develop)](https://codecov.io/github/NCAR/gmtb-ccpp?branch=develop) |
+
 
 ## Notes to Users
 This repository contains the Common Community Physics Packages (CCPP) and the driver 
@@ -30,17 +34,26 @@ provided once examples of fully functioning schemes are part of the CCPP.
 
 ## Requirements
 
-1. Compilers
-  1. [GNU Compiler Collection](https://gcc.gnu.org/)
-    * C
-    * Fortran: must be 2008 compliant. There are a number of Fortran
-    2003 pieces, and a single convenience right now with Fortran 2008.
-  2. Intel 16.0.2 and beyond work OK
-  3. PGI compilers do not easily support C functions calling Fortran routines.
-     The PGI compilers attach the Fortran module name as a prefix to the Fortran
-     symbol. This breaks the method that the CCPP uses to identify which schemes
-     to call.
-2. [Cmake](https://cmake.org)
+### Compilers
+The CCPP uses both the C and Fortran compilers. Note, the
+Fortran compiler must be 2008 compliant. There are a number of Fortran
+2003 pieces, and a single convenience right now with Fortran 2008.
+
+1. [GNU Compiler Collection](https://gcc.gnu.org/)
+2. [Intel 16.0.2](https://software.intel.com/en-us/intel-compilers) and beyond work.
+3. [PGI](http://www.pgroup.com/) compilers do **not** easily support C functions
+   calling Fortran routines. The PGI compilers attach the Fortran module name as a
+   prefix to the Fortran symbol. This **breaks** the method that the CCPP uses to
+   identify which schemes to call.
+
+### [Cmake](https://cmake.org)
+
+The CCPP build system uses cmake.
+
+### [LibXML2](http://xmlsoft.org/)
+
+The suite definition is currently written in XML, LibXML2 is currently used to
+parse these files.
 
 ## Building
 It is recommend to do an out of source build. This is "cmake" terminology

cmake/code_coverage.cmake

@@ -104,7 +104,7 @@ SET(CMAKE_CXX_FLAGS_COVERAGE
     "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
     CACHE STRING "Flags used by the C++ compiler during coverage builds."
     FORCE )
-SET(CMAKE_FC_FLAGS_COVERAGE
+SET(CMAKE_Fortran_FLAGS_COVERAGE
     "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
     CACHE STRING "Flags used by the Fortran compiler during coverage builds."
     FORCE )

src/tests/CMakeLists.txt

@@ -28,3 +28,10 @@ add_test(FIELDS test_fields)
 # Make sure we can do the cap call
 add_test(CHECK test_check  ${CMAKE_CURRENT_SOURCE_DIR}/suite_check.xml)
 
+#------------------------------------------------------------------------------
+# Coverage tests
+if(CMAKE_COMPILER_IS_GNUCC AND (CMAKE_BUILD_TYPE STREQUAL "Coverage"))
+    setup_target_for_coverage(coverage
+                              "test_check ${CMAKE_CURRENT_SOURCE_DIR}/suite_check.xml"
+                              coverage)
+endif()