GitHub Actions: another attempt at fixing cppcheck warnings.

cosinekitty · Jul 6, 2024 · 99d92f3 · 99d92f3
1 parent aa2615e
commit 99d92f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/generate/run b/generate/run
@@ -82,7 +82,7 @@ cd generate || Fail "Cannot change back to generate directory."
 
 echo ""
 echo "Building C source code for 'generate' program."
-CPPCHECK_OPTIONS=-I . -I novas -I vsop -I top2013 --error-exitcode=9 --enable=all --suppress=variableScope --suppress=unusedStructMember --suppress=missingIncludeSystem --suppress=unusedFunction
+CPPCHECK_OPTIONS="-I . -I novas -I vsop -I top2013 --error-exitcode=9 --enable=all --suppress=variableScope --suppress=unusedStructMember --suppress=missingIncludeSystem --suppress=unusedFunction"
 if [[ "${OS_NAME}" == "macOS" ]]; then
     CPPCHECK_OPTIONS += --check-level=exhaustive
 fi

diff --git a/generate/unit_test_c b/generate/unit_test_c
@@ -8,7 +8,11 @@ Fail()
 [[ "$1" == "" || "$1" == "-v" ]] || Fail "Invalid command line options."
 [[ -z "${CPP}" ]] && CPP=g++
 
-cppcheck -I ../source/c --enable=all --inline-suppr --suppress=unmatchedSuppression --suppress=variableScope --suppress=shadowFunction --suppress=unusedFunction --suppress=missingIncludeSystem --suppress=constParameterCallback --error-exitcode=9 ../source/c ../demo/c/*.c ctest.c || exit 1
+CPPCHECK_OPTIONS="-I ../source/c --enable=all --inline-suppr --suppress=unmatchedSuppression --suppress=variableScope --suppress=shadowFunction --suppress=unusedFunction --suppress=missingIncludeSystem --suppress=constParameterCallback --error-exitcode=9"
+if [[ "${OS_NAME}" == "macOS" ]]; then
+    CPPCHECK_OPTIONS += --check-level=exhaustive
+fi
+cppcheck ${CPPCHECK_OPTIONS} ../source/c ../demo/c/*.c ctest.c || exit 1
 
 # Verify that the source can be built as modern C++.
 ${CPP} -x c++ -std=c++17 -c -Wall -Werror -O3 ../source/c/astronomy.c || Fail "Cannot compile as C++"