espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-19 05:18:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensured unity_fixture tests pass

Browse Source
This commit is contained in:
Dennis Lambe Jr
2012-12-21 15:07:09 -05:00
parent c6c4c43ee3
commit 9d84912761
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extras/fixture/rakefile_helper.rb
View File

@ -87,7 +87,7 @@ module RakefileHelpers
return {:command => command, :options => options, :includes => includes} return {:command => command, :options => options, :includes => includes}
end end
def link(exe_name, obj_list) def link_it(exe_name, obj_list)
linker = build_linker_fields linker = build_linker_fields
cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " + cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
(obj_list.map{|obj|"#{$cfg['linker']['object_files']['path']}#{obj} "}).join + (obj_list.map{|obj|"#{$cfg['linker']['object_files']['path']}#{obj} "}).join +
@ -148,7 +148,8 @@ module RakefileHelpers
# Get a list of all source files needed # Get a list of all source files needed
src_files = Dir[HERE+'src/*.c'] src_files = Dir[HERE+'src/*.c']
src_files += Dir[HERE+'test/*.c'] src_files += Dir[HERE+'test/*.c']
src_files << '../../src/Unity.c' src_files += Dir[HERE+'test/main/*.c']
src_files << '../../src/unity.c'
# Build object files # Build object files
src_files.each { |f| compile(f, test_defines) } src_files.each { |f| compile(f, test_defines) }
@ -156,7 +157,7 @@ module RakefileHelpers
# Link the test executable # Link the test executable
test_base = "framework_test" test_base = "framework_test"
link(test_base, obj_list) link_it(test_base, obj_list)
# Execute unit test and generate results file # Execute unit test and generate results file
simulator = build_simulator_fields simulator = build_simulator_fields