merge confict

Former-commit-id: c6f0a15aa6d0db794f6e7a84fed825fbc1049ad9
This commit is contained in:
zhenwu 2019-10-23 15:06:30 +08:00
commit 883566c3f5

View File

@ -130,6 +130,5 @@ if [ $? -ne 0 ]; then
echo "generate ${FILE_INFO_OUTPUT_NEW} failed"
exit -2
fi
# gen html report
${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/