ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-08-14 07:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue in cmock_generator which was causing unity/auto/type_sanitizer to not be found from within Ceedling

Browse Source
This commit is contained in:
Greg Williams
2015-03-12 11:57:52 -04:00
parent 422077c929
commit e3859b2838
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_generator.rb
+12 -3
View File
@@ -4,9 +4,6 @@
# [Released under MIT License. Please refer to license.txt for details]
# ==========================================
$here = File.dirname __FILE__
require "#{$here}/../vendor/unity/auto/type_sanitizer"
class CMockGenerator
attr_accessor :config, :file_writer, :module_name, :clean_mock_name, :mock_name, :utils, :plugins, :ordered
@@ -24,6 +21,18 @@ class CMockGenerator
@includes_h_post_orig_header = (@config.includes_h_post_orig_header || []).map{|h| h =~ /</ ? h : "\"#{h}\""}
@includes_c_pre_header = (@config.includes_c_pre_header || []).map{|h| h =~ /</ ? h : "\"#{h}\""}
@includes_c_post_header = (@config.includes_c_post_header || []).map{|h| h =~ /</ ? h : "\"#{h}\""}
here = File.dirname __FILE__
unity_path_in_ceedling = "#{here}/../../unity" # path to Unity from within Ceedling
unity_path_in_cmock = "#{here}/../vendor/unity" # path to Unity from within CMock
if Dir.exist? unity_path_in_ceedling
require "#{unity_path_in_ceedling}/auto/type_sanitizer"
elsif Dir.exist? unity_path_in_cmock
require "#{unity_path_in_cmock}/auto/type_sanitizer"
else
raise "Failed to find an instance of Unity to pull in type_sanitizer module!"
end
end
def create_mock(module_name, parsed_stuff)