Improve codecov builds:

- allow private token for jenkins/codecov
- add custom targets for gcc/clang to generate codecov reports
- use CMake coverage target in jenkins build
- optional coverage_test argument when configuring the build

bin/ci/ubuntu/build-and-test.sh

@@ -5,7 +5,7 @@
 # debugging.
 set -ex
 __dirname=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-echo "using CC: $CC"
+echo "using CC: ${CC}"
 "${CC}" --version
 export CC
 COMPNAME=$(basename $CC)
@@ -15,14 +15,14 @@ if [[ $CXX ]]; then
   export CXX
 fi
 : ${BUILD_TYPE:=Debug}
-echo "BUILD TYPE: $BUILD_TYPE"
+echo "BUILD TYPE: ${BUILD_TYPE}"
 
 : ${TARGET:=install}
-echo "BUILD TARGET: $TARGET"
+echo "BUILD TARGET: ${TARGET}"
 
 # Ensure APP defaults to rippled if it's not set.
 : ${APP:=rippled}
-echo "using APP: $APP"
+echo "using APP: ${APP}"
 
 JOBS=${NUM_PROCESSORS:-2}
 if [[ ${TRAVIS:-false} != "true" ]]; then
@@ -37,6 +37,12 @@ else
   time=
 fi
 
+if [[ -z "${MAX_TIME:-}" ]] ; then
+  timeout_cmd=""
+else
+  timeout_cmd="timeout ${MAX_TIME}"
+fi
+
 echo "cmake building ${APP}"
 : ${CMAKE_EXTRA_ARGS:=""}
 if [[ ${NINJA_BUILD:-} == true ]]; then
@@ -44,9 +50,10 @@ if [[ ${NINJA_BUILD:-} == true ]]; then
 fi
 
 coverage=false
-if [[ "${CMAKE_EXTRA_ARGS}" =~ -Dcoverage=((on)|(ON)) ]] ; then
+if [[ "${TARGET}" == "coverage_report" ]] ; then
     echo "coverage option detected."
     coverage=true
+    export PATH=$PATH:${LCOV_ROOT}/usr/bin
 fi
 
 #
@@ -77,9 +84,10 @@ fi
 mkdir -p "build/${BUILD_DIR}"
 pushd "build/${BUILD_DIR}"
 # generate
-$time cmake ../.. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CMAKE_EXTRA_ARGS}
+${time} cmake ../.. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CMAKE_EXTRA_ARGS}
 # build
-time DESTDIR=$(pwd)/_INSTALLED_ cmake --build . --target ${TARGET} -- $BUILDARGS
+export DESTDIR=$(pwd)/_INSTALLED_
+time ${timeout_cmd} cmake --build . --target ${TARGET} -- $BUILDARGS
 if [[ ${TARGET} == "docs" ]]; then
   ## mimic the standard test output for docs build
   ## to make controlling processes like jenkins happy
@@ -92,10 +100,10 @@ if [[ ${TARGET} == "docs" ]]; then
 fi
 popd
 export APP_PATH="$PWD/build/${BUILD_DIR}/${APP}"
-echo "using APP_PATH: $APP_PATH"
+echo "using APP_PATH: ${APP_PATH}"
 
 # See what we've actually built
-ldd $APP_PATH
+ldd ${APP_PATH}
 
 function join_by { local IFS="$1"; shift; echo "$*"; }
 
@@ -126,24 +134,15 @@ if [[ ${APP} == "rippled" ]]; then
   else
     APP_ARGS+=" --unittest --quiet --unittest-log"
   fi
-  # Only report on src/ripple files
-  export LCOV_FILES="*/src/ripple/*"
-  # Nothing to explicitly exclude
-  export LCOV_EXCLUDE_FILES="LCOV_NO_EXCLUDE"
   if [[ ${coverage} == false && ${PARALLEL_TESTS:-} == true ]]; then
     APP_ARGS+=" --unittest-jobs ${JOBS}"
   fi
-else
-  : ${LCOV_FILES:="*/src/*"}
-  # Don't exclude anything
-  : ${LCOV_EXCLUDE_FILES:="LCOV_NO_EXCLUDE"}
 fi
 
-if [[ $coverage == true ]]; then
-  export PATH=$PATH:$LCOV_ROOT/usr/bin
-
-  # Create baseline coverage data file
-  lcov --no-external -c -i -d . -o baseline.info | grep -v "ignoring data for external file"
+if [[ ${coverage} == true ]]; then
+  # Push the results (lcov.info) to codecov
+  codecov -X gcov # don't even try and look for .gcov files ;)
+  find . -name "*.gcda" | xargs rm -f
 fi
 
 if [[ ${SKIP_TESTS:-} == true ]]; then
@@ -151,45 +150,20 @@ if [[ ${SKIP_TESTS:-} == true ]]; then
   exit
 fi
 
-if [[ "${MAX_TIME:-}" == "" ]] ; then
-  tcmd=""
-else
-  tcmd="timeout ${MAX_TIME}"
-fi
-
-if [[ ${DEBUGGER:-true} == "true" && -v GDB_ROOT && -x $GDB_ROOT/bin/gdb ]]; then
-  $GDB_ROOT/bin/gdb -v
+if [[ ${DEBUGGER:-true} == "true" && -v GDB_ROOT && -x ${GDB_ROOT}/bin/gdb ]]; then
+  ${GDB_ROOT}/bin/gdb -v
   # Execute unit tests under gdb, printing a call stack
   # if we get a crash.
   export APP_ARGS
-  $tcmd $GDB_ROOT/bin/gdb -return-child-result -quiet -batch \
+  ${timeout_cmd} ${GDB_ROOT}/bin/gdb -return-child-result -quiet -batch \
                     -ex "set env MALLOC_CHECK_=3" \
                     -ex "set print thread-events off" \
                     -ex run \
                     -ex "thread apply all backtrace full" \
                     -ex "quit" \
-                    --args $APP_PATH $APP_ARGS
+                    --args ${APP_PATH} ${APP_ARGS}
 else
-  $tcmd $APP_PATH $APP_ARGS
-fi
-
-if [[ $coverage == true ]]; then
-  # Create test coverage data file
-  lcov --no-external -c -d . -o tests.info | grep -v "ignoring data for external file"
-
-  # Combine baseline and test coverage data
-  lcov -a baseline.info -a tests.info -o lcov-all.info
-
-  # Included files
-  lcov -e "lcov-all.info" "${LCOV_FILES}" -o lcov.pre.info
-
-  # Excluded files
-  lcov --remove lcov.pre.info "${LCOV_EXCLUDE_FILES}" -o lcov.info
-
-  # Push the results (lcov.info) to codecov
-  codecov -X gcov # don't even try and look for .gcov files ;)
-
-  find . -name "*.gcda" | xargs rm -f
+  ${timeout_cmd} ${APP_PATH} ${APP_ARGS}
 fi