Skip to content

Commit 7eebcaa

Browse files
committed
use builddir consistently and verify usage of cached results in selfcheck
1 parent 65c94a6 commit 7eebcaa

2 files changed

Lines changed: 11 additions & 10 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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,15 @@ fi
1212
# self check externals
1313
./cppcheck $selfcheck_options externals || ec=1
1414
# self check lib/cli
15-
mkdir b1
16-
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json frontend || ec=1
17-
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json -Ifrontend cli || ec=1
18-
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json --enable=internal lib || ec=1
15+
./cppcheck $selfcheck_options $cppcheck_options --addon=naming.json frontend || ec=1
16+
./cppcheck $selfcheck_options $cppcheck_options --addon=naming.json -Ifrontend cli || ec=1
17+
./cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
1918
# check gui with qt settings
20-
mkdir b2
21-
./cppcheck $selfcheck_options $cppcheck_options $gui_options --cppcheck-build-dir=b2 --addon=naming.json -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
19+
./cppcheck $selfcheck_options $cppcheck_options $gui_options --addon=naming.json -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
2220
# self check test and tools
2321
./cppcheck $selfcheck_options $cppcheck_options -Ifrontend -Icli test/*.cpp || ec=1
2422
./cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1
2523
# triage
2624
./cppcheck $selfcheck_options $cppcheck_options $gui_options -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
2725

28-
rm -rf b2
29-
rm -rf b1
30-
3126
exit $ec

0 commit comments

Comments
 (0)