mirror of
https://github.com/ThrowTheSwitch/Unity.git
synced 2026-01-23 00:15:58 +01:00
- fixed summarizer to handle more generic input
- ignore comments in test parser - fixed a couple bugs in 16-bit support - fixed minor compiler errors for less lenient compilers - fixed error in docs. - renamed link to link_it in rakefiles to avoid collision in new versions of rake git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@136 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
@@ -109,7 +109,7 @@ module RakefileHelpers
|
||||
return {:command => command, :options => options, :includes => includes}
|
||||
end
|
||||
|
||||
def link(exe_name, obj_list)
|
||||
def link_it(exe_name, obj_list)
|
||||
linker = build_linker_fields
|
||||
cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
|
||||
(obj_list.map{|obj|"#{$cfg['linker']['object_files']['path']}#{obj} "}).join +
|
||||
@@ -205,7 +205,7 @@ module RakefileHelpers
|
||||
obj_list << test_base.ext($cfg['compiler']['object_files']['extension'])
|
||||
|
||||
# Link the test executable
|
||||
link(test_base, obj_list)
|
||||
link_it(test_base, obj_list)
|
||||
|
||||
# Execute unit test and generate results file
|
||||
simulator = build_simulator_fields
|
||||
@@ -250,7 +250,7 @@ module RakefileHelpers
|
||||
obj_list << main_base.ext($cfg['compiler']['object_files']['extension'])
|
||||
|
||||
# Create the executable
|
||||
link(main_base, obj_list)
|
||||
link_it(main_base, obj_list)
|
||||
end
|
||||
|
||||
def fail_out(msg)
|
||||
|
||||
@@ -2,6 +2,11 @@
|
||||
#include "ProductionCode2.h"
|
||||
#include "unity.h"
|
||||
|
||||
/* These should be ignored because they are commented out in various ways:
|
||||
#include "whatever.h"
|
||||
*/
|
||||
//#include "somethingelse.h"
|
||||
|
||||
void setUp(void)
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user