ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-09-16 23:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from jlesage/options_fix

Browse Source 
Properly merge options. (Thanks SO MUCH. I can't believe I missed that one)
This commit is contained in:
Mark VanderVoord
2014-05-22 08:57:23 -04:00
parent dfc238ea94 3def9e6011
commit 1756e4bb17
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock.rb
+1 -1
View File
@@ -77,7 +77,7 @@ if ($0 == __FILE__)
filelist = [] filelist = []
ARGV.each do |arg| ARGV.each do |arg|
if (arg =~ /^-o\"?([a-zA-Z0-9._\\\/:\s]+)\"?/) if (arg =~ /^-o\"?([a-zA-Z0-9._\\\/:\s]+)\"?/)
options.merge CMockConfig.load_config_file_from_yaml( arg.gsub(/^-o/,'') ) options.merge! CMockConfig.load_config_file_from_yaml( arg.gsub(/^-o/,'') )
elsif (arg =~ /^--([a-zA-Z0-9._\\\/:\s]+)=\"?([a-zA-Z0-9._\\\/:\s\;]+)\"?/) elsif (arg =~ /^--([a-zA-Z0-9._\\\/:\s]+)=\"?([a-zA-Z0-9._\\\/:\s\;]+)\"?/)
options = option_maker(options, $1, $2) options = option_maker(options, $1, $2)
else else