Unverified Commit b83c2d79 authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony Committed by GitHub
Browse files

Merge pull request #32543 from mantidproject/cppcheck_threshold_fix

Cppcheck threshold fix release-next
parents be0a43b0 1569478c
......@@ -44,7 +44,7 @@ const double GetEi::CROP = 0.15;
const double GetEi::GET_COUNT_RATE = 0.15;
const double GetEi::FIT_PEAK = 0.2;
/// Empty default constructor algorith() calls the constructor in the base class
/// Empty default constructor algorithm() calls the constructor in the base class
GetEi::GetEi() : Algorithm(), m_tempWS(), m_fracCompl(0.0) {}
void GetEi::init() {
......
......@@ -4,7 +4,7 @@ SCRIPT_DIR=$(dirname "$0")
# If errors slip through to master this can be used to set a non-zero
# allowed count while those errors are dealt with. This avoids breaking all
# builds for all developers
ALLOWED_ERRORS_COUNT=1204
ALLOWED_ERRORS_COUNT=1203
if [[ ${JOB_NAME} == *pull_requests* ]]; then
# This relies on the fact pull requests use pull/$PR-NAME
......@@ -42,9 +42,9 @@ cppcheck-htmlreport --file=cppcheck.xml --title=Embedded --report-dir=cppcheck-r
# Mark build as passed or failed
errors_count=$(grep -c '</error>' cppcheck.xml)
if [ $errors_count -gt ${ALLOWED_ERRORS_COUNT} ]; then
echo "CppCheck found ${ALLOWED_ERRORS_COUNT} errors."
echo "See CppCheck link on the job page for more detail."
if [ $errors_count -ne ${ALLOWED_ERRORS_COUNT} ]; then
echo "CppCheck found ${errors_count} errors."
echo "See CppCheck link on the job page for more detail, or adjust the count."
exit 1
else
echo "CppCheck found no errors"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment