mirror of
https://github.com/ThrowTheSwitch/CMock.git
synced 2026-08-22 02:59:56 +00:00
Merge pull request #80 from austinglaser/master
cmock handles multiple helper headers
This commit is contained in:
+6
-2
@@ -59,6 +59,7 @@ class CMockConfig
|
||||
end
|
||||
end
|
||||
options[:unity_helper_path] ||= options[:unity_helper]
|
||||
options[:unity_helper_path] = [options[:unity_helper_path]] if options[:unity_helper_path].is_a? String
|
||||
options[:plugins].compact!
|
||||
options[:plugins].map! {|p| p.to_sym}
|
||||
@options = options
|
||||
@@ -85,8 +86,11 @@ class CMockConfig
|
||||
end
|
||||
|
||||
def load_unity_helper
|
||||
return File.new(@options[:unity_helper_path]).read if (@options[:unity_helper_path])
|
||||
return nil
|
||||
return nil unless (@options[:unity_helper_path])
|
||||
|
||||
return @options[:unity_helper_path].inject("") do |unity_helper, filename|
|
||||
unity_helper + "\n" + File.new(filename).read
|
||||
end
|
||||
end
|
||||
|
||||
def standard_treat_as_map
|
||||
|
||||
Reference in New Issue
Block a user