lib/ceedling/configurator.rb in ceedling-0.21.0 vs lib/ceedling/configurator.rb in ceedling-0.22.0

@@ -77,10 +77,15 @@
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_RELEASE_ASSEMBLER )    if (config[:project][:release_build] and config[:release_build][:use_assembly])
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_RELEASE_DEPENDENCIES ) if (config[:project][:release_build] and config[:project][:use_deep_dependencies])
   end
   
   
+  def populate_unity_defaults(config)
+      unity = config[:unity] || {}
+      @runner_config = unity.merge(@runner_config || config[:test_runner] || {})
+  end
+
   def populate_cmock_defaults(config)
     # cmock has its own internal defaults handling, but we need to set these specific values
     # so they're present for the build environment to access;
     # note: these need to end up in the hash given to initialize cmock for this to be successful
     cmock = config[:cmock] || {}
@@ -104,10 +109,11 @@
     if (cmock[:unity_helper])
       cmock[:includes] << File.basename(cmock[:unity_helper])
       cmock[:includes].uniq!
     end
 
-    @runner_config = cmock.merge(config[:test_runner] || {})
+    @runner_config = cmock.merge(@runner_config || config[:test_runner] || {})
+
     @cmock_builder.manufacture(cmock)
   end
   
   
   def get_runner_config