ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-10-10 02:47:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ThrowTheSwitch/CMock

Browse Source 
Conflicts:
	lib/cmock_config.rb
	lib/cmock_generator_utils.rb
This commit is contained in:
Mark VanderVoord
2014-03-17 10:52:13 -04:00
parent 2e3744f748 a432aa3436
commit 4f2dd38b6c
2 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_config.rb
+18 -18
View File
@@ -8,24 +8,24 @@ class CMockConfig
CMockDefaultOptions = CMockDefaultOptions =
{ {
:framework => :unity, :framework => :unity,
:mock_path => 'mocks', :mock_path => 'mocks',
:mock_prefix => 'Mock', :mock_prefix => 'Mock',
:plugins => [], :plugins => [],
:strippables => ['(?:__attribute__\s*\(+.*?\)+)'], :strippables => ['(?:__attribute__\s*\(+.*?\)+)'],
:attributes => ['__ramfunc', '__irq', '__fiq', 'register', 'extern'], :attributes => ['__ramfunc', '__irq', '__fiq', 'register', 'extern'],
:c_calling_conventions => ['__stdcall', '__cdecl', '__fastcall'], :c_calling_conventions => ['__stdcall', '__cdecl', '__fastcall'],
:enforce_strict_ordering => false, :enforce_strict_ordering => false,
:unity_helper_path => false, :unity_helper_path => false,
:treat_as => {}, :treat_as => {},
:treat_as_void => [], :treat_as_void => [],
:memcmp_if_unknown => true, :memcmp_if_unknown => true,
:when_no_prototypes => :warn, #the options being :ignore, :warn, or :error :when_no_prototypes => :warn, #the options being :ignore, :warn, or :error
:when_ptr => :compare_data, #the options being :compare_ptr, :compare_data, or :smart :when_ptr => :compare_data, #the options being :compare_ptr, :compare_data, or :smart
:verbosity => 2, #the options being 0 errors only, 1 warnings and errors, 2 normal info, 3 verbose :verbosity => 2, #the options being 0 errors only, 1 warnings and errors, 2 normal info, 3 verbose
:treat_externs => :exclude, #the options being :include or :exclude :treat_externs => :exclude, #the options being :include or :exclude
:callback_include_count => true, :callback_include_count => true,
:callback_after_arg_check => false, :callback_after_arg_check => false,
:includes => nil, :includes => nil,
:includes_h_pre_orig_header => nil, :includes_h_pre_orig_header => nil,
:includes_h_post_orig_header => nil, :includes_h_post_orig_header => nil,
lib/cmock_generator_utils.rb
-2
View File
@@ -14,7 +14,6 @@ class CMockGeneratorUtils
@ordered = @config.enforce_strict_ordering @ordered = @config.enforce_strict_ordering
@arrays = @config.plugins.include? :array @arrays = @config.plugins.include? :array
@cexception = @config.plugins.include? :cexception @cexception = @config.plugins.include? :cexception
@expect_any = @config.plugins.include? :expect_any_args
@return_thru_ptr = @config.plugins.include? :return_thru_ptr @return_thru_ptr = @config.plugins.include? :return_thru_ptr
@ignore_arg = @config.plugins.include? :ignore_arg @ignore_arg = @config.plugins.include? :ignore_arg
@treat_as = @config.treat_as @treat_as = @config.treat_as
@@ -41,7 +40,6 @@ class CMockGeneratorUtils
lines << " cmock_call_instance->LineNumber = cmock_line;\n" lines << " cmock_call_instance->LineNumber = cmock_line;\n"
lines << " cmock_call_instance->CallOrder = ++GlobalExpectCount;\n" if (@ordered and global_ordering_supported) lines << " cmock_call_instance->CallOrder = ++GlobalExpectCount;\n" if (@ordered and global_ordering_supported)
lines << " cmock_call_instance->ExceptionToThrow = CEXCEPTION_NONE;\n" if (@cexception) lines << " cmock_call_instance->ExceptionToThrow = CEXCEPTION_NONE;\n" if (@cexception)
lines << " cmock_call_instance->IgnoreMode = CMOCK_ARG_ALL;\n" if (@expect_any)
lines lines
end end