Fixed #12771 (Progress value is not increased)

Author: danmar

cli/processexecutor.cpp

@@ -407,7 +407,9 @@ unsigned int ProcessExecutor::check()
                             fileCount++;
                             processedsize += size;
                             if (!mSettings.quiet)
-                                Executor::reportStatus(fileCount, mFiles.size() + mFileSettings.size(), processedsize, totalfilesize);
+                                Executor::reportStatus(fileCount, mFiles.size() + mFileSettings.size(), //processedsize, totalfilesize);
+                                                       mFileSettings.empty() ? processedsize : fileCount,
+                                                       mFileSettings.empty() ? totalfilesize : mFileSettings.size());
 
                             close(*rp);
                             rp = rpipes.erase(rp);

cli/threadexecutor.cpp

@@ -153,7 +153,7 @@ class ThreadData
         mProcessedSize += fileSize;
         mProcessedFiles++;
         if (!mSettings.quiet)
-            logForwarder.reportStatus(mProcessedFiles, mTotalFiles, mProcessedSize, mTotalFileSize);
+            logForwarder.reportStatus(mProcessedFiles, mTotalFiles, mTotalFileSize>0 ? mProcessedSize : mProcessedFiles, mTotalFileSize>0 ? mTotalFileSize: mTotalFiles);
     }
 
 private:

test/cli/more-projects_test.py

@@ -1061,3 +1061,39 @@ def test_project_file_no_analyze_all_vs_configs(tmp_path):
     ret, stdout, stderr = cppcheck(['--project=' + str(project_path)])
     assert ret == 0, stdout
     assert stderr == ''
+
+
+@pytest.mark.parametrize("j,executor", [
+    (1, "thread"),
+    (2, "thread"),
+    (2, "process"),
+])
+def test_project_progress(tmp_path, j, executor):
+    if sys.platform == 'win32' and executor == "process":
+        pytest.skip("process executor not supported on Windows")
+
+    code = 'x = 1;'
+    with open(tmp_path / 'test1.c', 'wt') as f:
+        f.write(code)
+    with open(tmp_path / 'test2.c', 'wt') as f:
+        f.write(code)
+
+    compilation_db = [
+        {"directory": str(tmp_path),
+         "command": "gcc -c test1.c",
+         "file": "test1.c",
+         "output": "test1.o"},
+        {"directory": str(tmp_path),
+         "command": "gcc -c test2.c",
+         "file": "test2.c",
+         "output": "test2.o"},
+    ]
+
+    project_file = tmp_path / 'compile_commands.json'
+
+    with open(project_file, 'wt') as f:
+        f.write(json.dumps(compilation_db))
+
+    _, stdout, _ = cppcheck([f'--project={project_file}', f'-j{j}', f'--executor={executor}'])
+    assert '1/2 files checked 50% done' in stdout
+    assert '2/2 files checked 100% done' in stdout

test/cli/other_test.py

@@ -1076,22 +1076,20 @@ def test_markup_j(tmpdir):
     assert exitcode == 0, stdout if stdout else stderr
     lines = stdout.splitlines()
     for i in range(1, 5):
-        lines.remove('{}/4 files checked 0% done'.format(i))
-
-    # this test started to fail in the -j2 injection run when using ThreadExecutor although it always specifies -j2.
-    # the order of the files in the output changed so just check for the file extentions
-    assert len(lines) == 4
-    assert lines[0].endswith('.cpp ...')
-    assert lines[1].endswith('.cpp ...')
-    assert lines[2].endswith('.qml ...')
-    assert lines[3].endswith('.qml ...')
-
-    #assert lines == [
-    #    'Checking {} ...'.format(test_file_2),
-    #    'Checking {} ...'.format(test_file_4),
-    #    'Checking {} ...'.format(test_file_1),
-    #    'Checking {} ...'.format(test_file_3)
-    #]
+        try:
+            if '{}/4 files checked 0% done'.format(i) in lines:
+                lines.remove('{}/4 files checked 0% done'.format(i))
+            else:
+                lines.remove('{}/4 files checked {}% done'.format(i, i * 25))
+        except ValueError as e:
+            assert False, f'failed {i}'
+
+    assert sorted(lines) == [
+        'Checking {} ...'.format(test_file_1),
+        'Checking {} ...'.format(test_file_2),
+        'Checking {} ...'.format(test_file_3),
+        'Checking {} ...'.format(test_file_4)
+    ]
     assert stderr == ''