Skip to content

Fix #13825 (toomanyconfigs lacks file information) #7967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 13 commits into from
Nov 20, 2025
Merged

Fix #13825 (toomanyconfigs lacks file information) #7967

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8cacf1f
Experimental fix for #13825 (toomanyconfigs lacks file information)
danmar Nov 17, 2025
707d166
tweak
danmar Nov 17, 2025
39cd696
runformat
danmar Nov 17, 2025
b3dda6a
fix
danmar Nov 17, 2025
41b6f93
test
danmar Nov 18, 2025
49fed2d
refactor
danmar Nov 18, 2025
4ed0b8d
newlines
danmar Nov 18, 2025
3943e9e
improve testing
danmar Nov 18, 2025
88efa98
remove toomanyconfigs, tested in other_test.py
danmar Nov 18, 2025
e5da14c
pylint
danmar Nov 18, 2025
120c393
comment why information message should be skipped when --max-configs …
danmar Nov 19, 2025
b862703
test
danmar Nov 19, 2025
ecb1cf2
daca2->simple
danmar Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions cli/cppcheckexecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,10 +432,6 @@ int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& sup
returnValue = settings.exitCode;
}

if (!settings.checkConfiguration) {
cppcheck.tooManyConfigsError("",0U);
}

stdLogger.writeCheckersReport(supprs);

if (settings.outputFormat == Settings::OutputFormat::xml) {
Expand Down
48 changes: 16 additions & 32 deletions lib/cppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,6 +1041,9 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
for (const std::string &config : configurations)
(void)preprocessor.getcode(config, files, false);

if (configurations.size() > mSettings.maxConfigs)
tooManyConfigsError(Path::toNativeSeparators(file.spath()), configurations.size());

if (analyzerInformation)
mLogger->setAnalyzerInfo(nullptr);
return 0;
Expand All @@ -1060,14 +1063,6 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
}
#endif

if (!mSettings.force && configurations.size() > mSettings.maxConfigs) {
if (mSettings.severity.isEnabled(Severity::information)) {
tooManyConfigsError(Path::toNativeSeparators(file.spath()),configurations.size());
} else {
mTooManyConfigs = true;
}
}

FilesDeleter filesDeleter;

// write dump file xml prolog
Expand All @@ -1092,8 +1087,18 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str

// Check only a few configurations (default 12), after that bail out, unless --force
// was used.
if (!mSettings.force && ++checkCount > mSettings.maxConfigs)
if (!mSettings.force && ++checkCount > mSettings.maxConfigs) {
// If maxConfigs has default value then report information message that configurations are skipped.
// If maxConfigs does not have default value then the user is explicitly skipping configurations so
// the information message is not reported, the whole purpose of setting i.e. --max-configs=1 is to
// skip configurations. When --check-config is used then tooManyConfigs will be reported even if the
// value is non-default.
const Settings defaultSettings;
if (mSettings.maxConfigs == defaultSettings.maxConfigs && mSettings.severity.isEnabled(Severity::information))
tooManyConfigsError(Path::toNativeSeparators(file.spath()), configurations.size());

Copy link
Copy Markdown
Collaborator

@firewave firewave Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels very strange.

Also the check for the default value should not be hard-coded - use a default Settings object to check against.

Copy link
Copy Markdown
Collaborator Author

@danmar danmar Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wrote a comment to describe it.

Copy link
Copy Markdown
Collaborator

@firewave firewave Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Seems to make sense but I have not thought too much about it - as I have not dug too much into #7424.

But I have to from a different angle anyways as part of preprocessor work I am doing. But merging this should be fine (possibly even helpful as there is less code to go through).

break;
}

std::string currentConfig;

Expand Down Expand Up @@ -1630,32 +1635,14 @@ void CppCheck::executeAddonsWholeProgram(const std::list<FileWithDetails> &files

void CppCheck::tooManyConfigsError(const std::string &file, const int numberOfConfigurations)
{
if (!mSettings.severity.isEnabled(Severity::information) && !mTooManyConfigs)
return;

mTooManyConfigs = false;

if (mSettings.severity.isEnabled(Severity::information) && file.empty())
return;

std::list<ErrorMessage::FileLocation> loclist;
if (!file.empty()) {
loclist.emplace_back(file, 0, 0);
}

std::ostringstream msg;
msg << "Too many #ifdef configurations - cppcheck only checks " << mSettings.maxConfigs;
if (numberOfConfigurations > mSettings.maxConfigs)
msg << " of " << numberOfConfigurations << " configurations. Use --force to check all configurations.\n";
if (file.empty())
msg << " configurations. Use --force to check all configurations. For more details, use --enable=information.\n";
msg << "The checking of the file will be interrupted because there are too many "
"#ifdef configurations. Checking of all #ifdef configurations can be forced "
"by --force command line option or from GUI preferences. However that may "
"increase the checking time.";
if (file.empty())
msg << " For more details, use --enable=information.";

msg << "Too many #ifdef configurations - cppcheck only checks " << mSettings.maxConfigs
<< " of " << numberOfConfigurations << " configurations. Use --force to check all configurations.";

ErrorMessage errmsg(std::move(loclist),
"",
Expand All @@ -1669,8 +1656,6 @@ void CppCheck::tooManyConfigsError(const std::string &file, const int numberOfCo

void CppCheck::purgedConfigurationMessage(const std::string &file, const std::string& configuration)
{
mTooManyConfigs = false;

if (mSettings.severity.isEnabled(Severity::information) && file.empty())
return;

Expand Down Expand Up @@ -1699,7 +1684,6 @@ void CppCheck::getErrorMessages(ErrorLogger &errorlogger)

CppCheck cppcheck(settings, supprs, errorlogger, true, nullptr);
cppcheck.purgedConfigurationMessage("","");
cppcheck.mTooManyConfigs = true;
cppcheck.tooManyConfigsError("",0U);
// TODO: add functions to get remaining error messages

Expand Down
3 changes: 0 additions & 3 deletions lib/cppcheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,6 @@ class CPPCHECKLIB CppCheck {

bool mUseGlobalSuppressions;

/** Are there too many configs? */
bool mTooManyConfigs{};

/** File info used for whole program analysis */
std::list<Check::FileInfo*> mFileInfo;

Expand Down
31 changes: 31 additions & 0 deletions test/cli/other_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3948,3 +3948,34 @@ def test_simplecpp_syntax_error(tmp_path):
'{}:1:0: error: No header in #include [syntaxError]'.format(test_file),
'{}:1:0: error: No header in #include [syntaxError]'.format(test_file)
]

def test_max_configs(tmp_path):
test_file = tmp_path / 'test.cpp'
with open(test_file, "w") as f:
for i in range(1,20):
dir = 'if' if i == 1 else 'elif'
f.write(f'#{dir} defined(X{i})\nx = {i};\n')
f.write('#endif\n')

args = ['--enable=information', '--template=daca2', str(test_file)]
Copy link
Copy Markdown
Collaborator

@firewave firewave Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are using the daca2 template?

Copy link
Copy Markdown
Collaborator Author

@danmar danmar Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because default template writes 3 lines instead of 1.

Copy link
Copy Markdown
Collaborator Author

@danmar danmar Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any 1-line template format will do here imho

Copy link
Copy Markdown
Collaborator

@firewave firewave Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

simple is usually used in the tests.


# default max configs is set to 12, warn if code contains more configurations than that
_, _, stderr = cppcheck(args)
assert stderr.splitlines() == [
'{}:0:0: information: Too many #ifdef configurations - cppcheck only checks 12 of 20 configurations. Use --force to check all configurations. [toomanyconfigs]'.format(test_file)
]

# set explicit max configs => do not warn
# configurations are likely skipped by intention
_, _, stderr = cppcheck(['--max-configs=6'] + args)
assert stderr.splitlines() == []

# when using --check-configs, warn if code contains more than max configs
_, _, stderr = cppcheck(['--check-config', '--max-configs=6'] + args)
assert stderr.splitlines() == [
'{}:0:0: information: Too many #ifdef configurations - cppcheck only checks 6 of 20 configurations. Use --force to check all configurations. [toomanyconfigs]'.format(test_file)
]

# when using --check-configs, do not warn if code contains less than max configs
_, _, stderr = cppcheck(['--check-config', '--max-configs=60'] + args)
assert stderr.splitlines() == []
30 changes: 0 additions & 30 deletions test/testcppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ class TestCppcheck : public TestFixture {
TEST_CASE(getDumpFileContentsLibrary);
TEST_CASE(checkPlistOutput);
TEST_CASE(premiumResultsCache);
TEST_CASE(toomanyconfigs);
TEST_CASE(purgedConfiguration);
}

Expand Down Expand Up @@ -594,35 +593,6 @@ class TestCppcheck : public TestFixture {
ASSERT(hash1 != hash2);
}

void toomanyconfigs() const
{
ScopedFile test_file_a("a.c",
"#if DEF_1\n"
"#endif\n"
"#if DEF_2\n"
"#endif\n"
"#if DEF_3\n"
"#endif");

// this is the "simple" format
const auto s = dinit(Settings,
$.templateFormat = templateFormat, // TODO: remove when we only longer rely on toString() in unique message handling
$.severity.enable (Severity::information);
$.maxConfigs = 2);
Suppressions supprs;
ErrorLogger2 errorLogger;
CppCheck cppcheck(s, supprs, errorLogger, false, {});
ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(test_file_a.path(), Path::identify(test_file_a.path(), false), 0)));
// TODO: how to properly disable these warnings?
errorLogger.errmsgs.erase(std::remove_if(errorLogger.errmsgs.begin(), errorLogger.errmsgs.end(), [](const ErrorMessage& msg) {
return msg.id == "logChecker";
}), errorLogger.errmsgs.end());
// the internal errorlist is cleared after each check() call
ASSERT_EQUALS(1, errorLogger.errmsgs.size());
const auto it = errorLogger.errmsgs.cbegin();
ASSERT_EQUALS("a.c:0:0: information: Too many #ifdef configurations - cppcheck only checks 2 of 4 configurations. Use --force to check all configurations. [toomanyconfigs]", it->toString(false, templateFormat, ""));
}

void purgedConfiguration() const
{
ScopedFile test_file("test.cpp",
Expand Down
Loading