properly guard {Process|Thread}Executor implementations

firewave · firewave · commit c485473dba7e · 2025-12-03T18:27:48.000+01:00
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
@@ -571,6 +571,13 @@ 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)"
+          # TODO: test NO_* defines
+
       - name: Show all ignored files
         if: false  # TODO: currently lists all the contents of ignored folders - we only need what actually matched
         run: |
diff --git a/cli/processexecutor.cpp b/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"
diff --git a/cli/processexecutor.h b/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
diff --git a/cli/threadexecutor.cpp b/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
diff --git a/cli/threadexecutor.h b/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
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
@@ -16,8 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "filesettings.h"
 #include "fixture.h"
+
+#ifdef HAS_THREADING_MODEL_FORK
+#include "filesettings.h"
 #include "helpers.h"
 #include "processexecutor.h"
 #include "redirect.h"
@@ -33,12 +35,19 @@
 #include <string>
 #include <utility>
 #include <vector>
+#endif // HAS_THREADING_MODEL_FORK
 
 class TestProcessExecutorBase : public TestFixture {
 public:
-    TestProcessExecutorBase(const char * const name, bool useFS) : TestFixture(name), useFS(useFS) {}
+    TestProcessExecutorBase(const char * const name, bool useFS)
+        : TestFixture(name),
+#ifdef HAS_THREADING_MODEL_FORK
+        useFS(useFS)
+#endif // HAS_THREADING_MODEL_FORK
+    {}
 
 private:
+#ifdef HAS_THREADING_MODEL_FORK
     /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
     bool useFS;
 
@@ -110,10 +119,11 @@ class TestProcessExecutorBase : public TestFixture {
         ProcessExecutor executor(filelist, fileSettings, s, supprs, *this, executeFn);
         ASSERT_EQUALS(result, executor.check());
     }
+#endif // HAS_THREADING_MODEL_FORK
 
     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,9 +140,10 @@ 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
     }
 
+#ifdef HAS_THREADING_MODEL_FORK
     void deadlock_with_many_errors() {
         std::ostringstream oss;
         oss << "void f()\n"
@@ -315,6 +326,7 @@ class TestProcessExecutorBase : public TestFixture {
     }
 
     // TODO: test whole program analysis
+#endif // HAS_THREADING_MODEL_FORK
 };
 
 class TestProcessExecutorFiles : public TestProcessExecutorBase {
diff --git a/test/testsuppressions.cpp b/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;
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
@@ -16,8 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "filesettings.h"
 #include "fixture.h"
+
+#ifdef HAS_THREADING_MODEL_THREAD
+#include "filesettings.h"
 #include "helpers.h"
 #include "redirect.h"
 #include "settings.h"
@@ -33,12 +35,19 @@
 #include <string>
 #include <utility>
 #include <vector>
+#endif // HAS_THREADING_MODEL_THREAD
 
 class TestThreadExecutorBase : public TestFixture {
 public:
-    TestThreadExecutorBase(const char * const name, bool useFS) : TestFixture(name), useFS(useFS) {}
+    TestThreadExecutorBase(const char * const name, bool useFS)
+        : TestFixture(name),
+#ifdef HAS_THREADING_MODEL_THREAD
+        useFS(useFS)
+#endif // HAS_THREADING_MODEL_THREAD
+    {}
 
 private:
+#ifdef HAS_THREADING_MODEL_THREAD
     /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
     bool useFS;
 
@@ -111,9 +120,11 @@ class TestThreadExecutorBase : public TestFixture {
         ThreadExecutor executor(filelist, fileSettings, s, supprs, *this, executeFn);
         ASSERT_EQUALS(result, executor.check());
     }
+#endif // HAS_THREADING_MODEL_THREAD
 
     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,8 +141,10 @@ class TestThreadExecutorBase : public TestFixture {
         TEST_CASE(showtime_file_total);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
+#endif // HAS_THREADING_MODEL_THREAD
     }
 
+#ifdef HAS_THREADING_MODEL_THREAD
     void deadlock_with_many_errors() {
         std::ostringstream oss;
         oss << "void f()\n"
@@ -313,6 +326,7 @@ class TestThreadExecutorBase : public TestFixture {
     }
 
     // TODO: test whole program analysis
+#endif // HAS_THREADING_MODEL_THREAD
 };
 
 class TestThreadExecutorFiles : public TestThreadExecutorBase {
