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

- fixed yaml load option

Browse Source 
- added option to specify includes as <stdlib.h> so that they will get angle brackets instead of ""

git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@114 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
mvandervoord
2011-01-22 18:20:39 +00:00
parent 4b8d521247
commit aca9892418
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
auto/generate_test_runner.rb
View File

@@ -123,8 +123,8 @@ class UnityTestRunnerGenerator
output.puts("\n//=======Automagically Detected Files To Include=====")
output.puts("#include \"#{@options[:framework].to_s}.h\"")
output.puts('#include "cmock.h"') unless (mocks.empty?)
@options[:includes].flatten.uniq.compact.each do |includes|
output.puts("#include \"#{includes.gsub('.h','')}.h\"")
@options[:includes].flatten.uniq.compact.each do |inc|
output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h','')}.h\""}")
end
output.puts('#include <setjmp.h>')
output.puts('#include <stdio.h>')
@@ -274,7 +274,7 @@ if ($0 == __FILE__)
case(arg)
when '-cexception'
options[:plugins] = [:cexception]; true
when /\w+\.yml/
when /\.*\.yml/
options = UnityTestRunnerGenerator.grab_config(arg); true
else false
end
@@ -292,7 +292,7 @@ if ($0 == __FILE__)
ARGV[1] = ARGV[0].gsub(".c","_Runner.c") if (!ARGV[1])
#everything else is an include file
options[:includes] = (ARGV.slice(2..-1).flatten.compact) if (ARGV.size > 2)
options[:includes] ||= (ARGV.slice(2..-1).flatten.compact) if (ARGV.size > 2)
UnityTestRunnerGenerator.new(options).run(ARGV[0], ARGV[1])
end