Skip to content

Commit bbd1334

Browse files
committed
do not execute addons with UNUSEDFUNCTION_ONLY hack
1 parent 48cd90f commit bbd1334

2 files changed

Lines changed: 5 additions & 136 deletions

File tree

lib/cppcheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,7 @@ void CppCheck::executeAddons(const std::string& dumpFile, const FileWithDetails&
14951495

14961496
void CppCheck::executeAddons(const std::vector<std::string>& files, const std::string& file0)
14971497
{
1498-
if (mSettings.addons.empty() || files.empty())
1498+
if (mSettings.addons.empty() || files.empty() || Settings::unusedFunctionOnly())
14991499
return;
15001500

15011501
const bool isCtuInfo = endsWith(files[0], ".ctu-info");

test/cli/other_test.py

Lines changed: 4 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -4104,7 +4104,6 @@ def test_active_unusedfunction_only(tmp_path):
41044104

41054105

41064106
def test_active_unusedfunction_only_builddir(tmp_path):
4107-
# TODO: should only report a single active check
41084107
checkers_exp = [
41094108
'CheckUnusedFunctions::check'
41104109
]
@@ -4113,143 +4112,13 @@ def test_active_unusedfunction_only_builddir(tmp_path):
41134112

41144113
def test_active_unusedfunction_only_misra(tmp_path):
41154114
# TODO: should only report a single active check
4116-
__test_active_checkers(tmp_path, 263, 1166, use_unusedfunction_only=True, use_misra=True)
4115+
__test_active_checkers(tmp_path, 7, 1166, use_unusedfunction_only=True, use_misra=True)
41174116

41184117

41194118
@pytest.mark.xfail(strict=True) # TODO: active count and checkers.txt differ
41204119
def test_active_unusedfunction_only_misra_builddir(tmp_path):
41214120
# TODO: should only report a single active check
41224121
checkers_exp = [
4123-
'CheckUnusedFunctions::check',
4124-
'Misra C: 1.2',
4125-
'Misra C: 1.4',
4126-
'Misra C: 10.1',
4127-
'Misra C: 10.2',
4128-
'Misra C: 10.3',
4129-
'Misra C: 10.4',
4130-
'Misra C: 10.5',
4131-
'Misra C: 10.6',
4132-
'Misra C: 10.7',
4133-
'Misra C: 10.8',
4134-
'Misra C: 11.1',
4135-
'Misra C: 11.2',
4136-
'Misra C: 11.3',
4137-
'Misra C: 11.4',
4138-
'Misra C: 11.5',
4139-
'Misra C: 11.6',
4140-
'Misra C: 11.7',
4141-
'Misra C: 11.8',
4142-
'Misra C: 11.9',
4143-
'Misra C: 12.1',
4144-
'Misra C: 12.2',
4145-
'Misra C: 12.3',
4146-
'Misra C: 12.4',
4147-
'Misra C: 13.1',
4148-
'Misra C: 13.3',
4149-
'Misra C: 13.4',
4150-
'Misra C: 13.5',
4151-
'Misra C: 13.6',
4152-
'Misra C: 14.1',
4153-
'Misra C: 14.2',
4154-
'Misra C: 14.4',
4155-
'Misra C: 15.1',
4156-
'Misra C: 15.2',
4157-
'Misra C: 15.3',
4158-
'Misra C: 15.4',
4159-
'Misra C: 15.5',
4160-
'Misra C: 15.6',
4161-
'Misra C: 15.7',
4162-
'Misra C: 16.1',
4163-
'Misra C: 16.2',
4164-
'Misra C: 16.3',
4165-
'Misra C: 16.4',
4166-
'Misra C: 16.5',
4167-
'Misra C: 16.6',
4168-
'Misra C: 16.7',
4169-
'Misra C: 17.1',
4170-
'Misra C: 17.2',
4171-
'Misra C: 17.3',
4172-
'Misra C: 17.6',
4173-
'Misra C: 17.7',
4174-
'Misra C: 17.8',
4175-
'Misra C: 18.4',
4176-
'Misra C: 18.5',
4177-
'Misra C: 18.7',
4178-
'Misra C: 18.8',
4179-
'Misra C: 19.2',
4180-
'Misra C: 2.2',
4181-
'Misra C: 2.3',
4182-
'Misra C: 2.4',
4183-
'Misra C: 2.5',
4184-
'Misra C: 2.7',
4185-
'Misra C: 20.1',
4186-
'Misra C: 20.10',
4187-
'Misra C: 20.11',
4188-
'Misra C: 20.12',
4189-
'Misra C: 20.13',
4190-
'Misra C: 20.14',
4191-
'Misra C: 20.2',
4192-
'Misra C: 20.3',
4193-
'Misra C: 20.4',
4194-
'Misra C: 20.5',
4195-
'Misra C: 20.7',
4196-
'Misra C: 20.8',
4197-
'Misra C: 20.9',
4198-
'Misra C: 21.1',
4199-
'Misra C: 21.10',
4200-
'Misra C: 21.11',
4201-
'Misra C: 21.12',
4202-
'Misra C: 21.14',
4203-
'Misra C: 21.15',
4204-
'Misra C: 21.16',
4205-
'Misra C: 21.19',
4206-
'Misra C: 21.2',
4207-
'Misra C: 21.20',
4208-
'Misra C: 21.21',
4209-
'Misra C: 21.3',
4210-
'Misra C: 21.4',
4211-
'Misra C: 21.5',
4212-
'Misra C: 21.6',
4213-
'Misra C: 21.7',
4214-
'Misra C: 21.8',
4215-
'Misra C: 21.9',
4216-
'Misra C: 22.10',
4217-
'Misra C: 22.5',
4218-
'Misra C: 22.7',
4219-
'Misra C: 22.8',
4220-
'Misra C: 22.9',
4221-
'Misra C: 3.1',
4222-
'Misra C: 4.1',
4223-
'Misra C: 4.2',
4224-
'Misra C: 5.1',
4225-
'Misra C: 5.2',
4226-
'Misra C: 5.4',
4227-
'Misra C: 5.5',
4228-
'Misra C: 5.6',
4229-
'Misra C: 5.7',
4230-
'Misra C: 5.8',
4231-
'Misra C: 5.9',
4232-
'Misra C: 6.1',
4233-
'Misra C: 6.2',
4234-
'Misra C: 7.1',
4235-
'Misra C: 7.2',
4236-
'Misra C: 7.3',
4237-
'Misra C: 7.4',
4238-
'Misra C: 8.1',
4239-
'Misra C: 8.10',
4240-
'Misra C: 8.11',
4241-
'Misra C: 8.12',
4242-
'Misra C: 8.14',
4243-
'Misra C: 8.2',
4244-
'Misra C: 8.4',
4245-
'Misra C: 8.5',
4246-
'Misra C: 8.6',
4247-
'Misra C: 8.7',
4248-
'Misra C: 8.8',
4249-
'Misra C: 8.9',
4250-
'Misra C: 9.2',
4251-
'Misra C: 9.3',
4252-
'Misra C: 9.4',
4253-
'Misra C: 9.5'
4254-
]
4255-
__test_active_checkers(tmp_path, 263, 1166, use_unusedfunction_only=True, use_misra=True, checkers_exp=checkers_exp)
4122+
'CheckUnusedFunctions::check'
4123+
]
4124+
__test_active_checkers(tmp_path, 7, 1166, use_unusedfunction_only=True, use_misra=True, checkers_exp=checkers_exp)

0 commit comments

Comments
 (0)