From 94a36bd6e1a1018a47b9b670b21b7cbe98de33a9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Tue, 17 Jul 2018 17:19:54 +0900 Subject: [PATCH] Allow configuration over coverage report candidates (#665) This commit revises 'gen-coverage-report' script to take coverage report candidates from command-line. Now, the coverage report generated by './nncc gen-coverage-report contrib' will include all the code under 'contrib/'. Signed-off-by: Jonghyun Park --- scripts/command/gen-coverage-report | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/command/gen-coverage-report b/scripts/command/gen-coverage-report index 8a12bc7..74c3be2 100644 --- a/scripts/command/gen-coverage-report +++ b/scripts/command/gen-coverage-report @@ -17,11 +17,8 @@ if [[ -z "${GENHTML_PATH}" ]]; then exit 255 fi -OUTPUT_PATH="$1" - -if [[ -z "${OUTPUT_PATH}" ]]; then - OUTPUT_PATH="${NNCC_PROJECT_PATH}/coverage" -fi +OUTPUT_TAG="${NNCC_COVERAGE:-coverage}" +OUTPUT_PATH="${NNCC_COVERAGE_PATH:-${NNCC_PROJECT_PATH}/${OUTPUT_TAG}}" if [[ -e "${OUTPUT_PATH}" ]]; then echo "ERROR: '${OUTPUT_PATH}' already exists" @@ -35,8 +32,16 @@ EXTRACTED_COVERAGE_INFO_PATH="${OUTPUT_PATH}/coverage.extracted.info" EXCLUDED_COVERAGE_INFO_PATH="${OUTPUT_PATH}/coverage.excluded.info" HTML_PATH="${OUTPUT_PATH}/html" +CANDIDATES=() + +for CANDIDATE in "$@"; +do + CANDIDATES+=("${NNCC_PROJECT_PATH}/${CANDIDATE}/*") +done + "${LCOV_PATH}" -c -d "${BUILD_WORKSPACE_PATH}" -o "${RAW_COVERAGE_INFO_PATH}" "${LCOV_PATH}" -e "${RAW_COVERAGE_INFO_PATH}" -o "${EXTRACTED_COVERAGE_INFO_PATH}" \ + "${CANDIDATES[@]}" \ "${NNCC_PROJECT_PATH}"'/libs/*' "${NNCC_PROJECT_PATH}"'/tools/*' "${LCOV_PATH}" -r "${EXTRACTED_COVERAGE_INFO_PATH}" -o "${EXCLUDED_COVERAGE_INFO_PATH}" \ '*.test.cpp' -- 2.7.4