From 7e923d49e12949ab648d0238a3b9e74cdd43edc1 Mon Sep 17 00:00:00 2001 From: Mike Karlesky Date: Sat, 18 May 2024 21:33:14 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Restored=20:unity=20&=20:test=5F?= =?UTF-8?q?runner=20defines=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The clearer and more explicit means for handling :test_runner configuration lost its original :defines merge --- lib/ceedling/configurator.rb | 9 +++++++-- lib/ceedling/defaults.rb | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/ceedling/configurator.rb b/lib/ceedling/configurator.rb index 267f2bee..d7140464 100644 --- a/lib/ceedling/configurator.rb +++ b/lib/ceedling/configurator.rb @@ -104,7 +104,9 @@ def populate_defaults(config) def populate_unity_defaults(config) - # Do nothing + unity = config[:unity] || {} + + unity[:defines] = [] if (unity[:defines].nil?) end @@ -152,11 +154,14 @@ def configure_test_runner_generation(config) config[:test_runner][:cmdline_args] = true end - # Copy CMock options needed by test runner generation + # Copy CMock options used by test runner generation config[:test_runner][:mock_prefix] = config[:cmock][:mock_prefix] config[:test_runner][:mock_suffix] = config[:cmock][:mock_suffix] config[:test_runner][:enforce_strict_ordering] = config[:cmock][:enforce_strict_ordering] + # Merge Unity options used by test runner generation + config[:test_runner][:defines] += config[:unity][:defines] + @runner_config = config[:test_runner] end diff --git a/lib/ceedling/defaults.rb b/lib/ceedling/defaults.rb index 364c8168..cd386c0c 100644 --- a/lib/ceedling/defaults.rb +++ b/lib/ceedling/defaults.rb @@ -387,6 +387,7 @@ :test_runner => { :cmdline_args => false, :includes => [], + :defines => [], :file_suffix => '_runner', },