Skip to content

refs #14668 - aligned the selfcheck scripts#8443

Open
firewave wants to merge 1 commit intodanmar:mainfrom
firewave:selfcheck-sh
Open

refs #14668 - aligned the selfcheck scripts#8443
firewave wants to merge 1 commit intodanmar:mainfrom
firewave:selfcheck-sh

Conversation

@firewave
Copy link
Copy Markdown
Collaborator

No description provided.

@firewave
Copy link
Copy Markdown
Collaborator Author

This should allow us to move to a single script hopefully soonish.

@firewave firewave changed the title aligned the selfcheck scripts ref #14668 - aligned the selfcheck scripts Apr 12, 2026
@firewave firewave changed the title ref #14668 - aligned the selfcheck scripts refs #14668 - aligned the selfcheck scripts Apr 12, 2026
@firewave firewave marked this pull request as ready for review April 24, 2026 08:41
@sonarqubecloud
Copy link
Copy Markdown

@firewave
Copy link
Copy Markdown
Collaborator Author

Remaining diff:

--- selfcheck.sh        2026-04-24 11:05:36.430503150 +0200
+++ selfcheck_san.sh    2026-04-24 11:05:36.431503158 +0200
@@ -1,19 +1,17 @@
 #!/bin/sh
 
-cmake_output=cmake.output
-selfcheck_options_extra="$1"
+cmake_output="$1"
+selfcheck_options_extra="$2"
 
-cppcheck_bin=./cppcheck
+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"
-qt_options="--library=qt -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_MOC_HAS_STRINGDATA"  # TODO: use 69 as revision
+qt_options="--library=qt -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_MOC_HAS_STRINGDATA"
+qt_options="$qt_options --suppress=autoNoType:*/moc_*.cpp --suppress=symbolDatabaseWarning:*/moc_*.cpp"
 naming_options="--addon-python=$(command -v python) --addon=naming.json"
 
-mkdir_cmd=$(command -v mkdir)
-rm_cmd=$(command -v rm)
-
 # clear PATH to prevent unintentional process invocations
 export PATH=
 
@@ -23,28 +21,22 @@
   externals \
   || ec=1
 
-$mkdir_cmd b1
-
 $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 \
+  --enable=internal \
   lib \
   || ec=1
 
-$mkdir_cmd b2
-
 $cppcheck_bin $selfcheck_options $cppcheck_options $naming_options $qt_options \
-  --cppcheck-build-dir=b2 \
+  --suppress=constVariablePointer:*/moc_*.cpp \
   -DQT_CHARTS_LIB \
   -I$cmake_output/gui -Ifrontend -Igui \
   gui/*.cpp $cmake_output/gui \
@@ -65,7 +57,4 @@
   tools/triage/*.cpp $cmake_output/tools/triage \
   || ec=1
 
-$rm_cmd -rf b2
-$rm_cmd -rf b1
-
 exit $ec

This will be mainly addressed by #8204.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant