Skip to content

Commit cfce64a

Browse files
committed
refs #13245 - use builddir consistently and verify usage of cached results in selfcheck
1 parent 6293b2c commit cfce64a

2 files changed

Lines changed: 11 additions & 13 deletions

File tree

.github/workflows/CI-unixish.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,4 +695,10 @@ jobs:
695695
696696
- name: Self check
697697
run: |
698-
./selfcheck.sh
698+
mkdir b1
699+
./selfcheck.sh --cppcheck-build-dir=b1
700+
discards=$(./selfcheck.sh "--debug-analyzerinfo --cppcheck-build-dir=b1 --showtime=none" 2>&1 | grep -v skipping)
701+
if [ -n "$discards" ]; then
702+
echo $discards
703+
exit 1
704+
fi

selfcheck.sh

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ if [ -n "$1" ]; then
99
selfcheck_options="$selfcheck_options $1"
1010
fi
1111

12-
mkdir_cmd=$(command -v mkdir)
13-
rm_cmd=$(command -v rm)
14-
1512
# clear PATH to prevent unintentional process invocations
1613
export PATH=
1714

@@ -20,20 +17,15 @@ ec=0
2017
# self check externals
2118
./cppcheck $selfcheck_options externals || ec=1
2219
# self check lib/cli
23-
$mkdir_cmd b1
24-
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 $naming_options frontend || ec=1
25-
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 $naming_options -Ifrontend cli || ec=1
26-
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 $naming_options --enable=internal lib || ec=1
20+
./cppcheck $selfcheck_options $cppcheck_options $naming_options frontend || ec=1
21+
./cppcheck $selfcheck_options $cppcheck_options $naming_options -Ifrontend cli || ec=1
22+
./cppcheck $selfcheck_options $cppcheck_options $naming_options --enable=internal lib || ec=1
2723
# check gui with qt settings
28-
$mkdir_cmd b2
29-
./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
24+
./cppcheck $selfcheck_options $cppcheck_options $gui_options $naming_options -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
3025
# self check test and tools
3126
./cppcheck $selfcheck_options $cppcheck_options -Ifrontend -Icli test/*.cpp || ec=1
3227
./cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1
3328
# triage
3429
./cppcheck $selfcheck_options $cppcheck_options $gui_options -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
3530

36-
$rm_cmd -rf b2
37-
$rm_cmd -rf b1
38-
3931
exit $ec

0 commit comments

Comments
 (0)