actually only print the summary with --showtime=summary

Author: firewave

Makefile

@@ -664,7 +664,7 @@ cli/singleexecutor.o: cli/singleexecutor.cpp cli/executor.h cli/singleexecutor.h
 cli/stacktrace.o: cli/stacktrace.cpp cli/stacktrace.h lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/stacktrace.cpp
 
-cli/threadexecutor.o: cli/threadexecutor.cpp cli/cppcheckexecutor.h cli/executor.h cli/threadexecutor.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+cli/threadexecutor.o: cli/threadexecutor.cpp cli/cppcheckexecutor.h cli/executor.h cli/threadexecutor.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/threadexecutor.cpp
 
 test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h test/fixture.h test/options.h test/redirect.h

cli/threadexecutor.cpp

@@ -24,6 +24,7 @@
 #include "errorlogger.h"
 #include "importproject.h"
 #include "settings.h"
+#include "timer.h"
 
 #include <algorithm>
 #include <cassert>
@@ -193,7 +194,12 @@ unsigned int ThreadExecutor::check()
         }
     }
 
-    return std::accumulate(threadFutures.begin(), threadFutures.end(), 0U, [](unsigned int v, std::future<unsigned int>& f) {
+    unsigned int result = std::accumulate(threadFutures.begin(), threadFutures.end(), 0U, [](unsigned int v, std::future<unsigned int>& f) {
         return v + f.get();
     });
+
+    if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY)
+        CppCheck::printTimerResultsSummary();
+
+    return result;
 }

lib/cppcheck.cpp

@@ -404,7 +404,9 @@ CppCheck::~CppCheck()
         delete mFileInfo.back();
         mFileInfo.pop_back();
     }
-    s_timerResults.showResults(mSettings.showtime);
+
+    if (mSettings.showtime != SHOWTIME_MODES::SHOWTIME_SUMMARY)
+        s_timerResults.showResults(mSettings.showtime);
 
     if (mPlistFile.is_open()) {
         mPlistFile << ErrorLogger::plistFooter();
@@ -1837,3 +1839,8 @@ void CppCheck::resetTimerResults()
 {
     s_timerResults.reset();
 }
+
+void CppCheck::printTimerResultsSummary()
+{
+    s_timerResults.showResults(SHOWTIME_MODES::SHOWTIME_SUMMARY);
+}

lib/cppcheck.h

@@ -142,6 +142,7 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     void removeCtuInfoFiles(const std::map<std::string, std::size_t>& files); // cppcheck-suppress functionConst // has side effects
 
     static void resetTimerResults();
+    static void printTimerResultsSummary();
 
 private:
 #ifdef HAVE_RULES

releasenotes.txt

@@ -9,3 +9,4 @@ GUI:
 Changed interface:
 
 Other:
+- "--showtime=summary" will now show a single summary at the end instead of showing it after each file when using the thread execution (default on Windows)

test/testthreadexecutor.cpp

@@ -107,6 +107,7 @@ class TestThreadExecutor : public TestFixture {
         TEST_CASE(markup);
         TEST_CASE(showtime_top5);
         TEST_CASE(showtime_file);
+        TEST_CASE(showtime_summary);
     }
 
     void deadlock_with_many_errors() {
@@ -269,6 +270,17 @@ class TestThreadExecutor : public TestFixture {
         const std::string output_s = GET_REDIRECT_OUTPUT;
         ASSERT_EQUALS(2, find_all_of(output_s, "Overall time:"));
     }
+
+    void showtime_summary() {
+        REDIRECT;
+        check(1, 2, 0,
+              "int main() {}",
+              true, SHOWTIME_MODES::SHOWTIME_SUMMARY);
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        // should only report the actual summary once
+        ASSERT(output_s.find("1 result(s)") == std::string::npos);
+        ASSERT(output_s.find("2 result(s)") != std::string::npos);
+    }
 };
 
 REGISTER_TEST(TestThreadExecutor)