From 9035807689c2a3e207299ed98b17fa913fc80c71 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Mon, 11 Dec 2023 15:16:28 -0500 Subject: [PATCH] Further fixing of broken stuff. --- lib/ceedling/file_finder_helper.rb | 4 ++-- lib/ceedling/test_invoker.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ceedling/file_finder_helper.rb b/lib/ceedling/file_finder_helper.rb index 4cb31123..d68d3acf 100644 --- 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 index 83ee7423..87c4661e 100644 --- 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)