Further fixing of broken stuff.

ThrowTheSwitch · Dec 11, 2023 · 9035807 · 9035807
1 parent 9849578
commit 9035807
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/ceedling/file_finder_helper.rb b/lib/ceedling/file_finder_helper.rb
@@ -48,12 +48,12 @@ def find_file_in_collection(file_name, file_list, complain, original_filepath=""
   private
 
   def blow_up(file_name, extra_message="")
-    error = ["ERROR: Found no file '#{file_name}' in search paths.", extra_message].join(' ').compact
+    error = ["ERROR: Found no file '#{file_name}' in search paths.", extra_message].join(' ').strip
     raise CeedlingException.new(error)
   end
 
   def gripe(file_name, extra_message="")
-    warning = ["WARNING: Found no file '#{file_name}' in search paths.", extra_message].join(' ').compact
+    warning = ["WARNING: Found no file '#{file_name}' in search paths.", extra_message].join(' ').strip
     @streaminator.stderr_puts(warning + extra_message, Verbosity::COMPLAIN)
   end
 

diff --git a/lib/ceedling/test_invoker.rb b/lib/ceedling/test_invoker.rb
@@ -362,6 +362,7 @@ def compile_test_component(tool:TOOLS_TEST_COMPILER, context:TEST_SYM, test:, so
     testable = @testables[test]
     filepath = testable[:filepath]
     flags = testable[:compile_flags]
+    defines = testable[:defines]
 
     # Tailor search path--remove duplicates and reduce list to only those needed by vendor / support file compilation
     search_paths = @helper.tailor_search_paths(search_paths:testable[:search_paths], filepath:source)