Skip to content

Commit 7afc8b1

Browse files
committed
enabled tests for #11283 and removed selfcheck workaround
1 parent d07eb88 commit 7afc8b1

4 files changed

Lines changed: 1 addition & 9 deletions

File tree

.github/workflows/CI-unixish.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,12 +470,6 @@ jobs:
470470
selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
471471
ec=0
472472
473-
# work around missingInclude not being reported with -j and the --check-config requirement for detailed warnings
474-
./cppcheck $selfcheck_options -DCHECK_INTERNAL cli lib --check-config --suppress=missingIncludeSystem --suppress=unmatchedSuppression || ec=1
475-
./cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 --library=qt --addon=naming.json -Igui/temp -Igui gui/*.cpp gui/temp/*.cpp --check-config --suppress=missingIncludeSystem --suppress=unmatchedSuppression || ec=1
476-
./cppcheck $selfcheck_options -Icli test/*.cpp tools/*.cpp --check-config --suppress=missingIncludeSystem --suppress=unmatchedSuppression || ec=1
477-
./cppcheck $selfcheck_options -DQ_MOC_OUTPUT_REVISION=67 --library=qt -Itools/triage/temp -Igui tools/triage/*.cpp tools/triage/temp/*.cpp --check-config --suppress=missingIncludeSystem --suppress=unmatchedSuppression || ec=1
478-
479473
# early exit
480474
if [ $ec -eq 1 ]; then
481475
exit $ec

releasenotes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
release notes for cppcheck-2.11
22

33
- It is no longer necessary to run "--check-config" to get detailed "missingInclude" and "missingIncludeSystem" messages. They will always be issued in the regular analysis if "missingInclude" is enabled.
4-
4+
- "missingInclude" and "missingIncludeSystem" are reported with "-j" is > 1 and processes are used in the backend (default in non-Windows binaries)

test/cli/test-helloworld.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,5 @@ def __test_missing_include_system(use_j):
202202
def test_missing_include_system():
203203
__test_missing_include_system(False)
204204

205-
@pytest.mark.xfail
206205
def test_missing_include_system_j(): #11283
207206
__test_missing_include_system(True)

test/cli/test-other.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ def __test_missing_include(tmpdir, use_j):
2323
def test_missing_include(tmpdir):
2424
__test_missing_include(tmpdir, False)
2525

26-
@pytest.mark.xfail
2726
def test_missing_include_j(tmpdir): #11283
2827
__test_missing_include(tmpdir, True)
2928

0 commit comments

Comments
 (0)