refs #14668 - aligned the selfcheck scripts (#8443)

Author: firewave

selfcheck.sh

@@ -1,14 +1,16 @@
 #!/bin/sh
 
+cmake_output=cmake.output
+selfcheck_options_extra="$1"
+
+cppcheck_bin=./cppcheck
+
 selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude,information --exception-handling --debug-warnings --check-level=exhaustive"
+selfcheck_options="$selfcheck_options $selfcheck_options_extra"
 cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
-gui_options="-DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt"
+qt_options="--library=qt -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_MOC_HAS_STRINGDATA"  # TODO: use 69 as revision
 naming_options="--addon-python=$(command -v python) --addon=naming.json"
 
-if [ -n "$1" ]; then
-  selfcheck_options="$selfcheck_options $1"
-fi
-
 mkdir_cmd=$(command -v mkdir)
 rm_cmd=$(command -v rm)
 
@@ -17,21 +19,51 @@ export PATH=
 
 ec=0
 
-# self check externals
-./cppcheck $selfcheck_options externals || ec=1
-# self check lib/cli
+$cppcheck_bin $selfcheck_options \
+  externals \
+  || ec=1
+
 $mkdir_cmd b1
-./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 $naming_options frontend || ec=1
-./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 $naming_options -Ifrontend cli || ec=1
-./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 $naming_options --enable=internal lib || ec=1
-# check gui with qt settings
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --cppcheck-build-dir=b1 \
+  frontend \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --cppcheck-build-dir=b1 \
+  -Ifrontend \
+  cli \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --cppcheck-build-dir=b1 --enable=internal \
+  lib \
+  || ec=1
+
 $mkdir_cmd b2
-./cppcheck $selfcheck_options $cppcheck_options $gui_options --cppcheck-build-dir=b2 $naming_options -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
-# self check test and tools
-./cppcheck $selfcheck_options $cppcheck_options -Ifrontend -Icli test/*.cpp || ec=1
-./cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1
-# triage
-./cppcheck $selfcheck_options $cppcheck_options $gui_options -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options $qt_options \
+  --cppcheck-build-dir=b2 \
+  -DQT_CHARTS_LIB \
+  -I$cmake_output/gui -Ifrontend -Igui \
+  gui/*.cpp $cmake_output/gui \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Ifrontend -Icli \
+  test/*.cpp \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Icli \
+  tools/dmake/*.cpp \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $qt_options \
+  -I$cmake_output/tools/triage -Igui \
+  tools/triage/*.cpp $cmake_output/tools/triage \
+  || ec=1
 
 $rm_cmd -rf b2
 $rm_cmd -rf b1

selfcheck_san.sh

@@ -3,6 +3,8 @@
 cmake_output="$1"
 selfcheck_options_extra="$2"
 
+cppcheck_bin=$cmake_output/bin/cppcheck
+
 selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude,information --exception-handling --debug-warnings --check-level=exhaustive"
 selfcheck_options="$selfcheck_options $selfcheck_options_extra"
 cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
@@ -15,42 +17,42 @@ export PATH=
 
 ec=0
 
-$cmake_output/bin/cppcheck $selfcheck_options \
+$cppcheck_bin $selfcheck_options \
   externals \
   || ec=1
 
-$cmake_output/bin/cppcheck $selfcheck_options $cppcheck_options $naming_options \
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
   frontend \
   || ec=1
 
-$cmake_output/bin/cppcheck $selfcheck_options $cppcheck_options $naming_options \
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
   -Ifrontend \
   cli \
   || ec=1
 
-$cmake_output/bin/cppcheck $selfcheck_options $cppcheck_options $naming_options \
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
   --enable=internal \
   lib \
   || ec=1
 
-$cmake_output/bin/cppcheck $selfcheck_options $cppcheck_options $naming_options $qt_options \
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options $qt_options \
   --suppress=constVariablePointer:*/moc_*.cpp \
   -DQT_CHARTS_LIB \
   -I$cmake_output/gui -Ifrontend -Igui \
   gui/*.cpp $cmake_output/gui \
   || ec=1
 
-$cmake_output/bin/cppcheck $selfcheck_options $cppcheck_options \
-  -Icli -Ifrontend \
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Ifrontend -Icli \
   test/*.cpp \
   || ec=1
 
-$cmake_output/bin/cppcheck $selfcheck_options $cppcheck_options \
+$cppcheck_bin $selfcheck_options $cppcheck_options \
   -Icli \
   tools/dmake/*.cpp \
   || ec=1
 
-$cmake_output/bin/cppcheck $selfcheck_options $cppcheck_options $qt_options \
+$cppcheck_bin $selfcheck_options $cppcheck_options $qt_options \
   -I$cmake_output/tools/triage -Igui \
   tools/triage/*.cpp $cmake_output/tools/triage \
   || ec=1