ceedling 1.1.3 → 1.1.4

data/lib/ceedling/preprocess/preprocessinator_includes_handler.rb

@@ -19,6 +19,7 @@ class PreprocessinatorIncludesHandler
     :include_factory,
     :tool_executor,
     :file_wrapper,
+    :file_path_utils,
     :yaml_wrapper,
     :parsing_parcels,
     :loginator,
@@ -48,25 +49,51 @@ class PreprocessinatorIncludesHandler
     # Notes:
     #  - This approach can have gaps with advacnced user-level macros like `#include <MACRO>`.
     #    By including Ceedling's vendor search path, we support Partials macros of this sort.
-    #  - Gaps can be minimized with proper defines in the project file. However, needed, complex macros 
+    #  - Gaps can be minimized with proper defines in the project file. However, needed, complex macros
     #    located in other header files could still gum up the works.
     #  - Many errors can occur but may not necessarily prevent usable results.
-    command = 
-      @tool_executor.build_command_line(
-        @configurator.tools_test_bare_includes_preprocessor,
-        # No additional arguments
-        [],
-        # Argument replacement
-        filepath,
-        defines,
-        flags,
-        search_paths
+    #
+    # GCC's quoted #include resolution always checks the directory of the file it's currently
+    # processing, independent of search paths -- a real sibling header on disk is opened and
+    # recursed into regardless of the restricted search paths above. Staging an isolated,
+    # sibling-free copy of the file being scanned keeps this pass's output limited to genuine
+    # top-level #include statements only. The isolation directory is minted directly inside the
+    # test's own preprocess-files build directory (already created in an earlier build stage) --
+    # no dedicated subdirectory or filename-based naming, to keep the resulting path as short as
+    # possible for platforms with tight path length limits.
+    isolation_parent = @file_path_utils.form_test_preprocess_files_path( test )
+    isolation_dir = @file_wrapper.mkdir_tmp( nil, isolation_parent )
+    isolated_filepath = File.join( isolation_dir, filename )
+
+    begin
+      @file_wrapper.cp( filepath, isolated_filepath )
+
+      msg = @reportinator.generate_module_progress(
+        operation: "Isolating a sibling-free copy for bare-includes extraction at",
+        module_name: test,
+        filename: isolated_filepath
       )
-
-    # Assume possible errors so we have best shot at extracting results from preprocessing.
-    # Full code compilation will catch any breaking code errors
-    command[:options][:boom] = false
-    shell_result = @tool_executor.exec( command )
+      @loginator.log( msg, Verbosity::OBNOXIOUS )
+
+      command =
+        @tool_executor.build_command_line(
+          @configurator.tools_test_bare_includes_preprocessor,
+          # No additional arguments
+          [],
+          # Argument replacement
+          isolated_filepath,
+          defines,
+          flags,
+          search_paths
+        )
+
+      # Assume possible errors so we have best shot at extracting results from preprocessing.
+      # Full code compilation will catch any breaking code errors
+      command[:options][:boom] = false
+      shell_result = @tool_executor.exec( command )
+    ensure
+      @file_wrapper.rm_rf( isolation_dir )
+    end
 
     make_rules = shell_result[:output]
 

data/lib/ceedling/test_invoker/test_build_executor.rb

@@ -183,6 +183,15 @@ class TestBuildExecutor
 
       @partializer.sanitize( module_contents )
 
+      # Generated once and shared by the implementation and interface headers below (via
+      # their own includes lists), so a module tested and mocked in the same test file gets
+      # exactly one C definition of each of its typedefs and aggregate types.
+      types_header = @generator.generate_partial_types(
+        name:        name,
+        c_module:    module_contents,
+        output_path: testable.paths[:partials]
+      )
+
       implementation = @partializer.extract_implementation_functions(
         test:        name,
         partial:     config.module,
@@ -211,10 +220,11 @@ class TestBuildExecutor
         function_definitions: implementation,
         c_module:             module_contents,
         header_includes:      @partializer.remap_implementation_header_includes(
-                                name:     config.module,
-                                includes: (config.source.includes + config.header.includes),
-                                partials: testable.partials.configs,
-                                test:     name
+                                name:         config.module,
+                                includes:     (config.source.includes + config.header.includes),
+                                partials:     testable.partials.configs,
+                                types_header: types_header,
+                                test:         name
                               ),
         source_includes:      @partializer.remap_implementation_source_includes(
                                 name:     config.module,
@@ -236,10 +246,11 @@ class TestBuildExecutor
         partial:               config.module,
         function_declarations: interface,
         includes:              @partializer.remap_interface_header_includes(
-                                 name:     config.module,
-                                 includes: (config.source.includes + config.header.includes),
-                                 partials: testable.partials.configs,
-                                 test:     name
+                                 name:         config.module,
+                                 includes:     (config.source.includes + config.header.includes),
+                                 partials:     testable.partials.configs,
+                                 types_header: types_header,
+                                 test:         name
                                ),
         c_module:              module_contents,
         input_filepath:        config.header.filepath,

data/lib/version.rb

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

data/mkdocs.yml

@@ -137,6 +137,7 @@ nav:
       - Global Project Settings: configuration/reference/project.md
       - Mixins: configuration/reference/mixins.md
       - Test Build Settings: configuration/reference/test-build.md
+      - Partials Settings: configuration/reference/partials.md
       - Release Build Settings: configuration/reference/release-build.md
       - Search Paths: configuration/reference/paths.md
       - File Collections: configuration/reference/files.md

data/site-local/404.html

@@ -1777,6 +1777,8 @@
         
       
         
+      
+        
       
         
       
@@ -1924,6 +1926,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="/configuration/reference/partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="/configuration/reference/release-build.html" class="md-nav__link">
         

data/site-local/configuration/environment-vars.html

@@ -1803,6 +1803,8 @@
         
       
         
+      
+        
       
         
       
@@ -1953,6 +1955,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="reference/partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="reference/release-build.html" class="md-nav__link">
         

data/site-local/configuration/global-collections.html

@@ -1803,6 +1803,8 @@
         
       
         
+      
+        
       
         
       
@@ -1953,6 +1955,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="reference/partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="reference/release-build.html" class="md-nav__link">
         

data/site-local/configuration/index.html

@@ -1793,6 +1793,8 @@
         
       
         
+      
+        
       
         
       
@@ -1943,6 +1945,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="reference/partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="reference/release-build.html" class="md-nav__link">
         

data/site-local/configuration/loading.html

@@ -1912,6 +1912,8 @@
         
       
         
+      
+        
       
         
       
@@ -2062,6 +2064,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="reference/partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="reference/release-build.html" class="md-nav__link">
         

data/site-local/configuration/mixins.html

@@ -2040,6 +2040,8 @@
         
       
         
+      
+        
       
         
       
@@ -2190,6 +2192,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="reference/partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="reference/release-build.html" class="md-nav__link">
         

data/site-local/configuration/parallel-builds.html

@@ -1901,6 +1901,8 @@
         
       
         
+      
+        
       
         
       
@@ -2051,6 +2053,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="reference/partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="reference/release-build.html" class="md-nav__link">
         

data/site-local/configuration/project-file.html

@@ -1912,6 +1912,8 @@
         
       
         
+      
+        
       
         
       
@@ -2062,6 +2064,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="reference/partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="reference/release-build.html" class="md-nav__link">
         

data/site-local/configuration/reference/cexception.html

@@ -1795,6 +1795,8 @@
         
       
         
+      
+        
       
         
       
@@ -1945,6 +1947,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="release-build.html" class="md-nav__link">
         

data/site-local/configuration/reference/cmock.html

@@ -1795,6 +1795,8 @@
         
       
         
+      
+        
       
         
       
@@ -1945,6 +1947,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="release-build.html" class="md-nav__link">
         

data/site-local/configuration/reference/defines.html

@@ -1795,6 +1795,8 @@
         
       
         
+      
+        
       
         
       
@@ -1945,6 +1947,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="release-build.html" class="md-nav__link">
         

data/site-local/configuration/reference/environment.html

@@ -1795,6 +1795,8 @@
         
       
         
+      
+        
       
         
       
@@ -1945,6 +1947,34 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="partials.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    
+  
+    Partials Settings
+  
+
+    
+  </span>
+  
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     <li class="md-nav__item">
       <a href="release-build.html" class="md-nav__link">