espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-07-25 12:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from pmendham/master

Browse Source 
Added support for mocks in sub-directories. (Thanks pmendham! This is helpful!)
This commit is contained in:
Mark VanderVoord
2016-02-01 18:20:37 -05:00
parent f36bd5f521 099b0db22b
commit ed2842fd4d
1 changed files with 6 additions and 4 deletions

10
auto/generate_test_runner.rb

@ -146,8 +146,9 @@ class UnityTestRunnerGenerator
def find_mocks(includes)
mock_headers = []
includes.each do |include_file|
mock_headers << File.basename(include_file) if (include_file =~ /^mock/i)
includes.each do |include_path|
include_file = File.basename(include_path)
mock_headers << include_path if (include_file =~ /^mock/i)
end
return mock_headers
end
@ -192,8 +193,8 @@ class UnityTestRunnerGenerator
output.puts('')
end
def create_mock_management(output, mocks)
unless (mocks.empty?)
def create_mock_management(output, mock_headers)
unless (mock_headers.empty?)
output.puts("\n//=======Mock Management=====")
output.puts("static void CMock_Init(void)")
output.puts("{")
@ -202,6 +203,7 @@ class UnityTestRunnerGenerator
output.puts(" GlobalVerifyOrder = 0;")
output.puts(" GlobalOrderError = NULL;")
end
mocks = mock_headers.map {|mock| File.basename(mock)}
mocks.each do |mock|
mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
output.puts(" #{mock_clean}_Init();")