🐛 Restored :unity & :test_runner defines merge

The clearer and more explicit means for handling :test_runner configuration lost its original :defines merge

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
 

lib/ceedling/defaults.rb

@@ -387,6 +387,7 @@
  :test_runner => {
  :cmdline_args => false,
  :includes => [],
+ :defines => [],
  :file_suffix => '_runner',
  },