1
0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-23 08:25:58 +01:00

Added more robust handling of test includes, and to provide backwards API compatibility for Ceedling

This commit is contained in:
Greg Williams
2014-07-30 10:28:24 -04:00
parent bff1fc68cb
commit a4a2eb787d

View File

@@ -130,7 +130,7 @@ class UnityTestRunnerGenerator
return mock_headers
end
def create_header(output, mocks, testfile_includes)
def create_header(output, mocks, testfile_includes=[])
output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
create_runtest(output, mocks)
output.puts("\n//=======Automagically Detected Files To Include=====")
@@ -142,9 +142,9 @@ class UnityTestRunnerGenerator
output.puts('#include <setjmp.h>')
output.puts('#include <stdio.h>')
output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception)
testfile_includes.delete("unity").delete("cmock")
testrunner_includes = testfile_includes - mocks
testrunner_includes.each do |inc|
testfile_includes.delete_if{|inc| inc =~ /(unity|cmock)/}
testrunner_includes = testfile_includes - mocks
testrunner_includes.each do |inc|
output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h','')}.h\""}")
end
mocks.each do |mock|