Skip to content

Commit 8041a74

Browse files
committed
refs #13245 - use builddir consistently and verify usage of cached results in selfcheck
1 parent eb00a42 commit 8041a74

2 files changed

Lines changed: 8 additions & 15 deletions

File tree

.github/workflows/CI-unixish.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,4 +738,10 @@ jobs:
738738
739739
- name: Self check
740740
run: |
741-
./selfcheck.sh
741+
mkdir b1
742+
./selfcheck.sh --cppcheck-build-dir=b1
743+
discards=$(./selfcheck.sh "--debug-analyzerinfo --cppcheck-build-dir=b1 --showtime=none" 2>&1 | grep -v skipping)
744+
if [ -n "$discards" ]; then
745+
echo $discards
746+
exit 1
747+
fi

selfcheck.sh

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppchec
1111
qt_options="--library=qt -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_MOC_HAS_STRINGDATA" # TODO: use 69 as revision
1212
naming_options="--addon-python=$(command -v python) --addon=naming.json"
1313

14-
mkdir_cmd=$(command -v mkdir)
15-
rm_cmd=$(command -v rm)
16-
1714
# clear PATH to prevent unintentional process invocations
1815
export PATH=
1916

@@ -23,28 +20,21 @@ $cppcheck_bin $selfcheck_options \
2320
externals \
2421
|| ec=1
2522

26-
$mkdir_cmd b1
27-
2823
$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
29-
--cppcheck-build-dir=b1 \
3024
frontend \
3125
|| ec=1
3226

3327
$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
34-
--cppcheck-build-dir=b1 \
3528
-Ifrontend \
3629
cli \
3730
|| ec=1
3831

3932
$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
40-
--cppcheck-build-dir=b1 --enable=internal \
33+
--enable=internal \
4134
lib \
4235
|| ec=1
4336

44-
$mkdir_cmd b2
45-
4637
$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options $qt_options \
47-
--cppcheck-build-dir=b2 \
4838
-DQT_CHARTS_LIB \
4939
-I$cmake_output/gui -Ifrontend -Igui \
5040
gui/*.cpp $cmake_output/gui \
@@ -65,7 +55,4 @@ $cppcheck_bin $selfcheck_options $cppcheck_options $qt_options \
6555
tools/triage/*.cpp $cmake_output/tools/triage \
6656
|| ec=1
6757

68-
$rm_cmd -rf b2
69-
$rm_cmd -rf b1
70-
7158
exit $ec

0 commit comments

Comments
 (0)