properly guard {Process|Thread}Executor implementations

Author: firewave

.github/workflows/CI-unixish.yml

@@ -571,6 +571,12 @@ jobs:
           warnings="-pedantic -Wall -Wextra -Wcast-qual -Wno-deprecated-declarations -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar"
           g++ $warnings -c -Ilib -Iexternals/tinyxml2 democlient/democlient.cpp
 
+      - name: Test disabled executors
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          g++ -Ilib -c cli/threadexecutor.cpp -DDISALLOW_THREAD_EXECUTOR
+          test -z "$(nm threadexecutor.o)"
+
       - name: Show all ignored files
         if: false  # TODO: currently lists all the contents of ignored folders - we only need what actually matched
         run: |

cli/processexecutor.cpp

@@ -22,7 +22,7 @@
 
 #include "processexecutor.h"
 
-#if !defined(_WIN32) && !defined(__MINGW32__)
+#ifdef HAS_THREADING_MODEL_FORK
 
 #include "cppcheck.h"
 #include "errorlogger.h"

cli/processexecutor.h

@@ -19,6 +19,10 @@
 #ifndef PROCESSEXECUTOR_H
 #define PROCESSEXECUTOR_H
 
+#include "config.h"
+
+#ifdef HAS_THREADING_MODEL_FORK
+
 #include "cppcheck.h"
 #include "executor.h"
 
@@ -72,4 +76,6 @@ class ProcessExecutor : public Executor {
 
 /// @}
 
+#endif // HAS_THREADING_MODEL_FORK
+
 #endif // PROCESSEXECUTOR_H

cli/threadexecutor.cpp

@@ -18,6 +18,8 @@
 
 #include "threadexecutor.h"
 
+#ifdef HAS_THREADING_MODEL_THREAD
+
 #include "config.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
@@ -219,3 +221,5 @@ unsigned int ThreadExecutor::check()
 
     return result;
 }
+
+#endif // HAS_THREADING_MODEL_THREAD

cli/threadexecutor.h

@@ -19,6 +19,10 @@
 #ifndef THREADEXECUTOR_H
 #define THREADEXECUTOR_H
 
+#include "config.h"
+
+#ifdef HAS_THREADING_MODEL_THREAD
+
 #include "cppcheck.h"
 #include "executor.h"
 
@@ -52,4 +56,6 @@ class ThreadExecutor : public Executor {
 
 /// @}
 
+#endif // HAS_THREADING_MODEL_THREAD
+
 #endif // THREADEXECUTOR_H

test/testprocessexecutor.cpp

@@ -112,8 +112,8 @@ class TestProcessExecutorBase : public TestFixture {
     }
 
     void run() override {
-#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
         mNewTemplate = true;
+#ifdef HAS_THREADING_MODEL_FORK
         TEST_CASE(deadlock_with_many_errors);
         TEST_CASE(many_threads);
         TEST_CASE(many_threads_showtime);
@@ -130,7 +130,7 @@ class TestProcessExecutorBase : public TestFixture {
         TEST_CASE(showtime_file_total);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
-#endif // !WIN32
+#endif // HAS_THREADING_MODEL_FORK
     }
 
     void deadlock_with_many_errors() {

test/testsuppressions.cpp

@@ -58,12 +58,14 @@ class TestSuppressions : public TestFixture {
         TEST_CASE(suppressionsFileNameWithExtraPath);
         TEST_CASE(suppressionsSettingsFiles);
         TEST_CASE(suppressionsSettingsFS);
+#ifdef HAS_THREADING_MODEL_THREAD
         TEST_CASE(suppressionsSettingsThreadsFiles);
         TEST_CASE(suppressionsSettingsThreadsFS);
-#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#endif // HAS_THREADING_MODEL_THREAD
+#ifdef HAS_THREADING_MODEL_FORK
         TEST_CASE(suppressionsSettingsProcessesFiles);
         TEST_CASE(suppressionsSettingsProcessesFS);
-#endif
+#endif // HAS_THREADING_MODEL_FORK
         TEST_CASE(suppressionsMultiFileFiles);
         TEST_CASE(suppressionsMultiFileFS);
         TEST_CASE(suppressionsPathSeparator);
@@ -294,6 +296,7 @@ class TestSuppressions : public TestFixture {
         return exitCode;
     }
 
+#ifdef HAS_THREADING_MODEL_THREAD
     unsigned int checkSuppressionThreadsFiles(const char code[], const std::string &suppression = "") {
         return _checkSuppressionThreads(code, false, suppression);
     }
@@ -341,8 +344,9 @@ class TestSuppressions : public TestFixture {
 
         return exitCode;
     }
+#endif // HAS_THREADING_MODEL_THREAD
 
-#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#ifdef HAS_THREADING_MODEL_FORK
     unsigned int checkSuppressionProcessesFiles(const char code[], const std::string &suppression = "") {
         return _checkSuppressionProcesses(code, false, suppression);
     }
@@ -390,7 +394,7 @@ class TestSuppressions : public TestFixture {
 
         return exitCode;
     }
-#endif
+#endif // HAS_THREADING_MODEL_FORK
 
     // TODO: check all results
     void runChecks(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
@@ -920,23 +924,25 @@ class TestSuppressions : public TestFixture {
         runChecks(&TestSuppressions::checkSuppressionFS);
     }
 
+#ifdef HAS_THREADING_MODEL_THREAD
     void suppressionsSettingsThreadsFiles() {
         runChecks(&TestSuppressions::checkSuppressionThreadsFiles);
     }
 
     void suppressionsSettingsThreadsFS() {
         runChecks(&TestSuppressions::checkSuppressionThreadsFS);
     }
+#endif // HAS_THREADING_MODEL_THREAD
 
-#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#ifdef HAS_THREADING_MODEL_FORK
     void suppressionsSettingsProcessesFiles() {
         runChecks(&TestSuppressions::checkSuppressionProcessesFiles);
     }
 
     void suppressionsSettingsProcessesFS() {
         runChecks(&TestSuppressions::checkSuppressionProcessesFS);
     }
-#endif
+#endif // HAS_THREADING_MODEL_FORK
 
     void suppressionsMultiFileInternal(unsigned int (TestSuppressions::*check)(std::map<std::string, std::string> &f, const std::string &)) {
         std::map<std::string, std::string> files;

test/testthreadexecutor.cpp

@@ -114,6 +114,7 @@ class TestThreadExecutorBase : public TestFixture {
 
     void run() override {
         mNewTemplate = true;
+#ifdef HAS_THREADING_MODEL_THREAD
         TEST_CASE(deadlock_with_many_errors);
         TEST_CASE(many_threads);
         TEST_CASE(many_threads_showtime);
@@ -130,6 +131,7 @@ class TestThreadExecutorBase : public TestFixture {
         TEST_CASE(showtime_file_total);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
+#endif // HAS_THREADING_MODEL_THREAD
     }
 
     void deadlock_with_many_errors() {