ceedling 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a54ad80f099a4117063db064305062de3ef308e0d6a34f5285ad616540c21239
-  data.tar.gz: aad1cd6bf73dc6710908593a9ec0c493404f13c1ecce8d7f285c2cd537b41b7f
+  metadata.gz: d99664eb478b97c839d72985434b355644836056256cd574d9d0868e7ece0f2d
+  data.tar.gz: c82999e6fe6a8eb48a3c3f33031453af444c4ef0fc98bb0be554879d6b6e6072
 SHA512:
-  metadata.gz: 0ee2a51402a1ca62a0e42f5c9c0b7cfb47871b4723fd33096ef22d90c0dc5ae7c7eb7944833e354a745c9d1123192ed6b92fb195537a8c9d69bd9c81e0330530
-  data.tar.gz: 2bfd96e070e2fa703f08e85587296690a930734a5eb409c709fd5bca2cd2875aa0b9eb8cb1dca9484852ab37ffc668f9d387fce1ed0c05fc90cd69507982dbcd
+  metadata.gz: 2464ee642f445988fdf76aff593d659f6c41da9c5e8a78431d17c690383fa84d21141fd0335d5737a9827cd04e48a956aa18c44f32348084e1b1d7055a4bdecd
+  data.tar.gz: a3251efd857f8314fdcef2f7e743d056d3aca42f76e01455f58b2c1caa7730aae1ca199c7c21bdc812ab2f50cbe4314be7f64c1ea56589ba2fbd4924a29b0e0a

data/GIT_COMMIT_SHA

@@ -1 +1 @@
-57b6a98
+4a45278

data/assets/tests_with_conditional_includes/src/feature_config.h

@@ -0,0 +1,13 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+#ifndef FEATURE_CONFIG_H
+#define FEATURE_CONFIG_H
+
+#define FEATURE_LEVEL (2)
+
+#endif // FEATURE_CONFIG_H

data/assets/tests_with_conditional_includes/src/feature_extra.h

@@ -0,0 +1,13 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+#ifndef FEATURE_EXTRA_H
+#define FEATURE_EXTRA_H
+
+#define FEATURE_EXTRA_MACRO (7)
+
+#endif // FEATURE_EXTRA_H

data/assets/tests_with_conditional_includes/src/local_flag_extra.h

@@ -0,0 +1,13 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+#ifndef LOCAL_FLAG_EXTRA_H
+#define LOCAL_FLAG_EXTRA_H
+
+#define LOCAL_FLAG_MACRO (11)
+
+#endif // LOCAL_FLAG_EXTRA_H

data/assets/tests_with_conditional_includes/src/nested_extra.h

@@ -0,0 +1,13 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+#ifndef NESTED_EXTRA_H
+#define NESTED_EXTRA_H
+
+#define NESTED_MACRO (17)
+
+#endif // NESTED_EXTRA_H

data/assets/tests_with_conditional_includes/src/nested_wrapper.h

@@ -0,0 +1,16 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+/* widget.c includes this wrapper directly; nested_extra.h is only ever
+ * reached transitively through it, never named directly by widget.c. */
+
+#ifndef NESTED_WRAPPER_H
+#define NESTED_WRAPPER_H
+
+#include "nested_extra.h"
+
+#endif // NESTED_WRAPPER_H

data/assets/tests_with_conditional_includes/src/project_flag_extra.h

@@ -0,0 +1,13 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+#ifndef PROJECT_FLAG_EXTRA_H
+#define PROJECT_FLAG_EXTRA_H
+
+#define PROJECT_FLAG_MACRO (13)
+
+#endif // PROJECT_FLAG_EXTRA_H

data/assets/tests_with_conditional_includes/src/widget.c

@@ -0,0 +1,48 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+#include "widget.h"
+
+/* (a) Conditional include gated on a project-level :defines macro. */
+#ifdef PROJECT_FLAG
+#include "project_flag_extra.h"
+#endif
+
+#define LOCAL_FLAG (1)
+
+/* (b) Conditional include gated on a macro #define'd earlier in this same file. */
+#if LOCAL_FLAG
+#include "local_flag_extra.h"
+#endif
+
+/* (c) Reached only transitively, via nested_wrapper.h's own #include -- never
+ * itself named directly by this file. Must not appear as a duplicate,
+ * spuriously-promoted top-level #include in generated output. */
+#include "nested_wrapper.h"
+
+static int Widget__FromProjectFlag(void)
+{
+#ifdef PROJECT_FLAG
+    return PROJECT_FLAG_MACRO;
+#else
+    return 0;
+#endif
+}
+
+static int Widget__FromLocalFlag(void)
+{
+    return LOCAL_FLAG_MACRO;
+}
+
+static int Widget__FromNested(void)
+{
+    return NESTED_MACRO;
+}
+
+int Widget_FromProjectFlag(void) { return Widget__FromProjectFlag(); }
+int Widget_FromLocalFlag(void)   { return Widget__FromLocalFlag(); }
+int Widget_FromNested(void)      { return Widget__FromNested(); }

data/assets/tests_with_conditional_includes/src/widget.h

@@ -0,0 +1,15 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+#ifndef WIDGET_H
+#define WIDGET_H
+
+int Widget_FromProjectFlag(void);
+int Widget_FromLocalFlag(void);
+int Widget_FromNested(void);
+
+#endif // WIDGET_H

data/assets/tests_with_conditional_includes/src/widget_feature.c

@@ -0,0 +1,29 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+/* Reproduces issue #1223: a conditional #include guarded by a macro defined
+ * in an EARLIER #include in this same file (as opposed to a project :defines
+ * macro or a same-file #define, both of which already work correctly -- see
+ * widget.c). Ceedling's bare-includes extraction pass runs against an
+ * isolated, sibling-free copy of this file and so never actually opens
+ * feature_config.h to learn FEATURE_LEVEL's value, evaluating the #if below
+ * as false and silently dropping feature_extra.h from the generated Partial
+ * even though FEATURE_LEVEL is genuinely > 1. */
+
+#include "widget_feature.h"
+#include "feature_config.h"     /* defines FEATURE_LEVEL (2) */
+
+#if FEATURE_LEVEL > 1
+#include "feature_extra.h"      /* defines FEATURE_EXTRA_MACRO */
+#endif
+
+static int WidgetFeature__FromFeatureLevel(void)
+{
+    return FEATURE_EXTRA_MACRO;
+}
+
+int WidgetFeature_FromFeatureLevel(void) { return WidgetFeature__FromFeatureLevel(); }

data/assets/tests_with_conditional_includes/src/widget_feature.h

@@ -0,0 +1,13 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+#ifndef WIDGET_FEATURE_H
+#define WIDGET_FEATURE_H
+
+int WidgetFeature_FromFeatureLevel(void);
+
+#endif // WIDGET_FEATURE_H

data/assets/tests_with_conditional_includes/test/test_widget.c

@@ -0,0 +1,44 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+/* Partials pattern: TEST_PARTIAL_ALL_MODULE
+ * Exercises three #include-discovery scenarios that already work correctly
+ * without any source fix -- a regression guard locked in before touching
+ * the includes-discovery pipeline:
+ *   (a) conditional include gated on a project :defines macro
+ *   (b) conditional include gated on a same-file #define
+ *   (c) a header reached only transitively (never itself directly
+ *       #include'd by widget.c) correctly not duplicated in as a false
+ *       top-level entry */
+
+#include "unity.h"
+#include "ceedling.h"
+
+#include TEST_PARTIAL_ALL_MODULE(widget)
+
+void setUp(void)
+{
+}
+
+void tearDown(void)
+{
+}
+
+void test_FromProjectFlag_ReturnsProjectFlagMacro(void)
+{
+    TEST_ASSERT_EQUAL_INT(13, Widget__FromProjectFlag());
+}
+
+void test_FromLocalFlag_ReturnsLocalFlagMacro(void)
+{
+    TEST_ASSERT_EQUAL_INT(11, Widget__FromLocalFlag());
+}
+
+void test_FromNested_ReturnsNestedMacro(void)
+{
+    TEST_ASSERT_EQUAL_INT(17, Widget__FromNested());
+}

data/assets/tests_with_conditional_includes/test/test_widget_feature.c

@@ -0,0 +1,31 @@
+/* =========================================================================
+    Ceedling - Test-Centered Build System for C
+    ThrowTheSwitch.org
+    Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+/* Partials pattern: TEST_PARTIAL_ALL_MODULE
+ * Regression test for #1223: without the fix, this fails to *compile* --
+ * FEATURE_EXTRA_MACRO is undeclared in the generated Partial implementation
+ * because feature_extra.h's conditional #include (guarded by a macro from
+ * an earlier #include in widget_feature.c) is silently dropped. See
+ * widget_feature.c for the full explanation. */
+
+#include "unity.h"
+#include "ceedling.h"
+
+#include TEST_PARTIAL_ALL_MODULE(widget_feature)
+
+void setUp(void)
+{
+}
+
+void tearDown(void)
+{
+}
+
+void test_FromFeatureLevel_ReturnsFeatureExtraMacro(void)
+{
+    TEST_ASSERT_EQUAL_INT(7, WidgetFeature__FromFeatureLevel());
+}

data/docs/Changelog.md

@@ -1,4 +1,4 @@
-p# 🌱 Ceedling Changelog
+# 🌱 Ceedling Changelog
 
 This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
@@ -10,6 +10,24 @@ This changelog is complemented by three other documents:
 
 ---
 
+# [1.1.6] — 2026-08-25
+
+## 🌟 Added
+
+- Latest patch releases of Unity, CMock, and CException.
+
+## 💪 Fixed
+
+- [#1223](https://github.com/ThrowTheSwitch/Ceedling/issues/1223) Fixed a conditional `#include` silently dropping out of generated code derived from preprocessed code, breaking compilation with an undeclared identifier error. The specific case involves a macro defined by another header included earlier in the same file.
+- [#1216](https://github.com/ThrowTheSwitch/Ceedling/issues/1216) Fixed self-test issue that caused docs-related failures when the local documentation was unavailable (generated in CI but not necessarily present during self tests).
+- [#1236](https://github.com/ThrowTheSwitch/Ceedling/issues/1236) Fixed an issue that converted system includes extracted from a test C file into user includes when generating a test runner (e.g. `#include <sys/stat.h>` became `#include "stat.h"`) and also stripped relative paths from all includes injected into a test runner.
+
+### Partials
+
+- [#1215](https://github.com/ThrowTheSwitch/Ceedling/issues/1215) Fixed `MOCK_PARTIAL_ALL_MODULE()`/`MOCK_PARTIAL_MODULE()` silently failing to partialize `inline` functions in some circumstances leading to duplicated symbols breaking compilation.
+
+---
+
 # [1.1.5] — 2026-08-19
 
 ## 💪 Fixed
@@ -254,6 +272,7 @@ When test preprocessing is enabled, Ceedling discovers whether your toolchain su
 
 ## 👋 Removed
 
+- `:use_deep_preprocessor` was a short-lived workaround option added after 1.0.0 for certain preprpocessing limitations. Those limitations are fully resolved, and test preprocessor options are now only `:use_test_preprocessor` and `:preprocess_force_fallback`. The latter should rarely be needed, leaving only the former as the only preprocessing feature toggle in Ceedling.
 - _CeedlingPacket.md_ user manual (superseded by [new documentation site](https://throwtheswitch.github.io/Ceedling/) and local bundle).
 - _PluginDevelopmentGuide.md_ (superseded by [new documentation site](https://throwtheswitch.github.io/Ceedling/) and local bundle).
 

data/examples/wondrous_forest/src/SensorHal.h

@@ -16,4 +16,17 @@ bool   SensorHal_IsChannelReady(SensorChannel_t channel);
 void   SensorHal_StartConversion(SensorChannel_t channel);
 uint32 SensorHal_GetTimestampMs(void);
 
+/* Vendor-header-style static inline register accessor -- the same pattern that
+ * makes a real hardware header need Partial mocking instead of ordinary mocking,
+ * since there is no separate .c file to exclude from a test build and swap for a
+ * mock's .o at link time. The real body here stands in for what would otherwise
+ * be a direct, unsafe-off-target memory-mapped register read: it always returns
+ * the same obviously-wrong sentinel, so a test can tell whether this real body
+ * ran (Partial mocking failed to intercept the call) instead of its mock. */
+static inline uint16 SensorHal_RawStatusRegister(SensorChannel_t channel)
+{
+    (void)channel;
+    return 0xDEADu;
+}
+
 #endif /* SENSOR_HAL_H */

data/examples/wondrous_forest/src/TemperatureSensor.c

@@ -9,9 +9,10 @@
 #include "TemperatureSensor.h"
 #include "SensorHal.h"
 
-static float s_calibration_offset;
-static int32 s_last_milli_celsius;
-static bool  s_reading_valid;
+static float  s_calibration_offset;
+static int32  s_last_milli_celsius;
+static bool   s_reading_valid;
+static uint16 s_last_status_register;
 
 /* Linearized approximation: full-scale 4095 counts maps 0 C to 85 C. */
 static int32 TemperatureSensor__RawToMilliCelsius(uint16 raw_counts)
@@ -45,8 +46,9 @@ bool TemperatureSensor_Sample(void)
 
     if (!SensorHal_IsChannelReady(SENSOR_CHANNEL_TEMP)) { return false; }
 
-    raw     = SensorHal_ReadChannel(SENSOR_CHANNEL_TEMP);
-    milli_c = TemperatureSensor__RawToMilliCelsius(raw);
+    raw                    = SensorHal_ReadChannel(SENSOR_CHANNEL_TEMP);
+    s_last_status_register = SensorHal_RawStatusRegister(SENSOR_CHANNEL_TEMP);
+    milli_c                = TemperatureSensor__RawToMilliCelsius(raw);
     milli_c += (int32)(s_calibration_offset * 1000.0f);
 
     s_reading_valid      = TemperatureSensor__IsInRange(milli_c);
@@ -65,3 +67,8 @@ bool TemperatureSensor_IsValid(void)
 {
     return s_reading_valid;
 }
+
+uint16 TemperatureSensor_GetStatusRegister(void)
+{
+    return s_last_status_register;
+}

data/examples/wondrous_forest/src/TemperatureSensor.h

@@ -10,9 +10,10 @@
 
 #include "Types.h"
 
-void  TemperatureSensor_Init(float calibration_offset_celsius);
-bool  TemperatureSensor_Sample(void);
-int32 TemperatureSensor_GetMilliCelsius(void);
-bool  TemperatureSensor_IsValid(void);
+void   TemperatureSensor_Init(float calibration_offset_celsius);
+bool   TemperatureSensor_Sample(void);
+int32  TemperatureSensor_GetMilliCelsius(void);
+bool   TemperatureSensor_IsValid(void);
+uint16 TemperatureSensor_GetStatusRegister(void);
 
 #endif /* TEMPERATURE_SENSOR_H */

data/examples/wondrous_forest/test/TestTemperatureSensor.c

@@ -5,17 +5,25 @@
     SPDX-License-Identifier: MIT
 ========================================================================= */
 
-/* Partials pattern: TEST_PARTIAL_ALL_MODULE
+/* Partials pattern: TEST_PARTIAL_ALL_MODULE + MOCK_PARTIAL_ALL_MODULE
  * Tests both public functions AND the private static helpers
  * TemperatureSensor__RawToMilliCelsius() and TemperatureSensor__IsInRange().
  * Also accesses the file-scoped static s_calibration_offset directly.
- * SensorHal is mocked traditionally since it has no private statics. */
+ * SensorHal is mocked via Partials (MOCK_PARTIAL_ALL_MODULE) rather than
+ * traditionally: SensorHal_RawStatusRegister() is a static inline function,
+ * which only Partial mocking (not ordinary CMock header mocking) can
+ * intercept -- there is no separate SensorHal.c definition for a static
+ * inline function to exclude from this test build and replace with a mock
+ * .o at link time, so the call must be redirected to the mock before that,
+ * at the #include level. Every existing SensorHal_*_Expect* call below
+ * keeps working unchanged either way, since Partial-mocked functions use
+ * the identical CMock expectation API as a traditionally mocked module. */
 
 #include "unity.h"
 #include "ceedling.h"
-#include "MockSensorHal.h"
 
 #include TEST_PARTIAL_ALL_MODULE(TemperatureSensor)
+#include MOCK_PARTIAL_ALL_MODULE(SensorHal)
 
 #include "Types.h"
 
@@ -78,6 +86,7 @@ void test_Sample_ReturnsTrueAndStoresReadingWhenReady(void)
     /* 1638 counts: (1638 * 85000) / 4095 ~= 34000 milli-C (34 C), in range */
     SensorHal_IsChannelReady_ExpectAndReturn(SENSOR_CHANNEL_TEMP, true);
     SensorHal_ReadChannel_ExpectAndReturn(SENSOR_CHANNEL_TEMP, 1638u);
+    SensorHal_RawStatusRegister_ExpectAndReturn(SENSOR_CHANNEL_TEMP, 0x1234u);
     SensorHal_StartConversion_Expect(SENSOR_CHANNEL_TEMP);
 
     TEST_ASSERT_TRUE(TemperatureSensor_Sample());
@@ -93,8 +102,28 @@ void test_CalibrationOffsetShiftsReading(void)
     /* 2048 counts ~= 42502 milli-C; with +1.0 C offset -> ~= 43502 */
     SensorHal_IsChannelReady_ExpectAndReturn(SENSOR_CHANNEL_TEMP, true);
     SensorHal_ReadChannel_ExpectAndReturn(SENSOR_CHANNEL_TEMP, 2048u);
+    SensorHal_RawStatusRegister_ExpectAndReturn(SENSOR_CHANNEL_TEMP, 0x1234u);
     SensorHal_StartConversion_Expect(SENSOR_CHANNEL_TEMP);
 
     TemperatureSensor_Sample();
     TEST_ASSERT_INT32_WITHIN(200, 43502, TemperatureSensor_GetMilliCelsius());
 }
+
+/* Regression test for #1215: a module partial-mocked via MOCK_PARTIAL_ALL_MODULE
+ * (as SensorHal is above) must have its calling module's real #include swapped for
+ * the generated mock interface header. Without that swap, SensorHal_RawStatusRegister()'s
+ * real static inline body -- unreachable through ordinary link-time mock substitution,
+ * since a static inline function has no separate object file to exclude -- compiles
+ * straight into this test build and always returns its 0xDEAD sentinel regardless of
+ * what's expected here, no matter what the mock is told to return. */
+void test_StatusRegisterReflectsMockedValueNotRealSentinel(void)
+{
+    SensorHal_IsChannelReady_ExpectAndReturn(SENSOR_CHANNEL_TEMP, true);
+    SensorHal_ReadChannel_ExpectAndReturn(SENSOR_CHANNEL_TEMP, 1638u);
+    SensorHal_RawStatusRegister_ExpectAndReturn(SENSOR_CHANNEL_TEMP, 0x1234u);
+    SensorHal_StartConversion_Expect(SENSOR_CHANNEL_TEMP);
+
+    TemperatureSensor_Sample();
+
+    TEST_ASSERT_EQUAL_HEX16(0x1234u, TemperatureSensor_GetStatusRegister());
+}

data/lib/ceedling/generators/generator_test_runner.rb

@@ -7,6 +7,7 @@
 
 require 'generate_test_runner' # Unity's test runner generator
 require 'ceedling/parsing_parcels'
+require 'ceedling/includes/includes'
 
 class GeneratorTestRunner
 
@@ -38,7 +39,30 @@ class GeneratorTestRunner
       @test_cases_internal,
       # Small hack for mock subdirectory support until include paths fully supported
       mocks.map{ |include| include.filepath },
-      includes.map{ |include| include.filename }
+      # Unity's own generator emits a string verbatim if it contains '<' and otherwise
+      # wraps it in double quotes -- each entry here must therefore already be in its
+      # final, exact form.
+      #
+      # System includes only: use the full, bracketed spelling (include_path, a
+      # reconciled SystemInclude's original as-written directive text -- e.g.
+      # "sys/stat.h" -- when set, else the directory-preserving filepath). A bare
+      # filename here drops both the directory component and the '<>' delimiters a
+      # system header's own search path depends on (issue #1236).
+      #
+      # User includes: bare filename, same as always. Unlike mocks (whose subdirectory
+      # is a real, dedicated build/test/mocks/<test>/ path -- hence their own
+      # directory-preserving filepath usage above) or a system header (whose directory
+      # is meaningful to the system include search path), a project's own directories
+      # are exposed to the compiler as a flat list of -I search paths, not nested to
+      # match whatever directory component a captured UserInclude's filepath happens to
+      # carry -- rendering the full path here breaks resolution instead of fixing it.
+      includes.map do |include|
+        if include.is_a?(SystemInclude)
+          "<#{include.include_path || include.filepath}>"
+        else
+          include.filename
+        end
+      end
     )
   end
 

data/lib/ceedling/partials/partializer.rb

@@ -125,8 +125,15 @@ class Partializer
 
     partials.each do |_module, config|
       # Remap mockable interface headers that will be injected into generated partial implementation
+      #
+      # Any real (non-nil) mock mode means this module has a generated mock interface header
+      # to redirect to -- PUBLIC/PRIVATE alone once covered every mode that existed, but DEDUCT
+      # (MOCK_PARTIAL_ALL_MODULE) and ACCUMULATE (MOCK_PARTIAL_MODULE) were added later without
+      # updating this check, so a module mocked via either of those was silently never
+      # redirected: its real header (and any static inline/static function bodies in it) stayed
+      # #include'd verbatim, compiling straight past the mock instead of being replaced by it.
       if includes.any? { |include| include.filename.ext().downcase() == _module.downcase() }
-        if [PUBLIC, PRIVATE].include?( config.mocks.type )
+        if !config.mocks.type.nil?
           # Insert mockable interface header from remapping of module name
           _includes << UserInclude.new(
             @file_path_utils.form_partial_interface_header_filename(_module)

data/lib/ceedling/preprocess/preprocessinator.rb

@@ -567,6 +567,28 @@ class Preprocessinator
         defines:       defines
       )
 
+      # Supplement with a literal text scan of the original file's own #include
+      # lines -- the gcc-based bare pass above runs against an isolated copy that
+      # can never open another header, so a conditional #include whose guard
+      # depends on a macro defined by an *earlier #include in this same file*
+      # evaluates false there and silently drops out. Unioning in this text-based
+      # pass's result only ever adds candidates for Includes.reconcile below to
+      # match against the accurate directives-only pass -- it can't introduce a
+      # spurious entry on its own, since reconcile still requires the accurate
+      # pass to also report it.
+      #
+      # This supplements the gcc-based pass rather than replacing it: gcc can
+      # resolve an #include whose target is itself a macro (e.g. the
+      # MOCK_PARTIAL_ALL_MODULE()-style directives this project's own generated
+      # test files use), since a command-line -D define is visible even to the
+      # isolated copy -- a literal text scan has no filename there to find at
+      # all, since none exists until a real preprocessor expands the macro. The
+      # two passes catch different, non-overlapping failure modes; keeping both
+      # covers both.
+      bare_includes = (
+        bare_includes + @includes_handler.extract_bare_includes_from_text( filepath: filepath )
+      ).uniq( &:filename )
+
       # Extract user includes
       user_includes = preprocess_user_includes(
         name:                     test,

data/lib/ceedling/preprocess/preprocessinator_includes_handler.rb

@@ -115,6 +115,39 @@ class PreprocessinatorIncludesHandler
     return includes
   end
 
+  # Scan the original file's own text for every #include line, unconditionally --
+  # no #if/#ifdef tracking at all, just literal presence. Supplements the gcc-based
+  # bare pass (`extract_bare_includes`), which runs against an isolated, sibling-free
+  # copy of the file and so can never open another header to resolve a conditional
+  # that depends on a macro that header defines (e.g. `#if SOME_MACRO_FROM_ANOTHER_HEADER`)
+  # -- GCC treats the macro as undefined there and silently drops the #include line
+  # from that pass's output even though it's a perfectly ordinary, real, top-level
+  # #include once actually evaluated with the real file in place. This method's result
+  # is meant to be unioned with the gcc-based bare pass's own result (see
+  # Preprocessinator#preprocess_file_includes_common), not used on its own -- an
+  # `Includes.reconcile` call downstream still only keeps an entry here if the
+  # accurate directives-only pass also reports it, so unconditionally capturing every
+  # literal #include line (regardless of whether its own guard is really true) is
+  # safe: it can only ever let back in an entry the accurate pass already confirmed,
+  # never introduce a spurious one on its own. A supplement, not a replacement --
+  # the gcc pass can still do something this literal scan structurally can't: resolve
+  # an #include whose own target is a macro rather than a literal filename.
+  def extract_bare_includes_from_text(filepath:)
+    includes = []
+
+    # Open in binary mode: code_lines applies clean_encoding per-line, but each_line
+    # itself can raise on invalid byte sequences before clean_encoding is reached.
+    @file_wrapper.open(filepath, 'rb') do |input|
+      @parsing_parcels.code_lines( input ) do |line|
+        _include = @include_factory.user_include_from_directive( line ) ||
+                   @include_factory.system_include_from_directive( line )
+        includes << Include.new( _include.filepath ) if !_include.nil?
+      end
+    end
+
+    return clean_self_reference( filepath, includes )
+  end
+
   def extract_user_includes_preprocess(name:, filepath:, preprocessed_filepath:)
     includes = []
 

data/lib/version.rb

@@ -15,7 +15,7 @@
 module Ceedling
   module Version
     # Convenience constants for gem building, etc.
-    GEM = '1.1.5'
+    GEM = '1.1.6'
     TAG = GEM
 
     # If run as a script print Ceedling's version to $stdout

data/spec/support/system/spec_system_helper.rb

@@ -150,6 +150,17 @@ def test_asset_path(asset_file_name)
   File.join(File.dirname(__FILE__), '..', '..', '..', 'assets', asset_file_name)
 end
 
+# `ceedling new`/`upgrade` only populates a project's docs/ceedling/ by copying this
+# repo's own site-local/ -- the local mkdocs HTML bundle, built only by `rake
+# docs:build:local` (see bin/cli_helper.rb's own identical check). That's a step CI
+# runs in a dedicated job before the test suite, but a plain local `bundle install &&
+# rspec` never runs at all, so docs/ceedling/ is legitimately absent there. Tests
+# asserting a deployed project's doc contents check this first rather than hardcoding
+# an assumption that only ever holds in CI's own environment (issue #1216).
+def html_docs_bundle_available?
+  Dir.exist?(File.join(File.dirname(__FILE__), '..', '..', '..', 'site-local'))
+end
+
 def unique_proj_name(prefix)
   safe = RSpec.current_example.description
     .downcase