3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-29 03:04:27 +01:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Greg Williams
2014-07-30 10:28:24 -04:00
parent bff1fc68cb
commit a4a2eb787d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
auto/generate_test_runner.rb
View File

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