test

Author: danmar

lib/cppcheck.cpp

@@ -857,6 +857,9 @@ std::size_t CppCheck::calculateHash(const Preprocessor& preprocessor, const std:
     toolinfo << (mSettings.severity.isEnabled(Severity::portability) ? 'p' : ' ');
     toolinfo << (mSettings.severity.isEnabled(Severity::information) ? 'i' : ' ');
     toolinfo << mSettings.userDefines;
+    toolinfo << (mSettings.checkConfiguration ? 'c' : ' '); // --check-config
+    toolinfo << (mSettings.force ? 'f' : ' ');
+    toolinfo << mSettings.maxConfigs;
     toolinfo << std::to_string(static_cast<std::uint8_t>(mSettings.checkLevel));
     for (const auto &a : mSettings.addonInfos) {
         toolinfo << a.name;

test/cli/other_test.py

@@ -3949,33 +3949,39 @@ def test_simplecpp_syntax_error(tmp_path):
         '{}:1:0: error: No header in #include [syntaxError]'.format(test_file)
     ]
 
-def test_max_configs(tmp_path):
+
+@pytest.mark.parametrize('max_configs,number_of_configs,check_config,expected_warn', [
+    # max configs = default, max configs < number of configs => warn
+    (12, 20, False, True),
+    (12, 20, True, True),
+
+    # max configs != default, max configs < number of configs => warn if --check-config
+    (6, 20, False, False),
+    (6, 20, True, True),
+
+    # max configs >= number of configs => no warning
+    (20, 20, False, False),
+    (20, 20, False, False)
+])
+def test_max_configs(tmp_path, max_configs, number_of_configs, check_config, expected_warn):
     test_file = tmp_path / 'test.cpp'
     with open(test_file, "w") as f:
-        for i in range(1,20):
+        for i in range(1,number_of_configs):
             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)]
+    args = [f'--max-configs={max_configs}', '--enable=information', '--template=daca2', str(test_file)]
+
+    if check_config:
+        args = ['--check-config'] + args
 
     # 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() == []
+    if not expected_warn:
+        assert stderr.splitlines() == []
+    else:
+        assert stderr.splitlines() == [
+            '{}:0:0: information: Too many #ifdef configurations - cppcheck only checks {} of {} configurations. Use --force to check all configurations. [toomanyconfigs]'
+            .format(test_file, max_configs, number_of_configs)
+        ]