- updated example and main tests to show how to use generate_test_runner with yaml target file

- improved error reporting for generate_test_runner

git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@96 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
mvandervoord
2010-09-22 00:19:04 +00:00
parent b7564ce8a0
commit 1f643e8661
9 changed files with 28 additions and 16 deletions

View File

@ -16,7 +16,7 @@ module RakefileHelpers
C_EXTENSION = '.c'
def load_configuration(config_file)
$cfg_file = config_file
$cfg_file = "targets/#{config_file}" unless $cfg_file =~ /[\\|\/]/
$cfg = YAML.load(File.read($cfg_file))
$colour_output = false unless $cfg['colour']
end
@ -27,7 +27,7 @@ module RakefileHelpers
def configure_toolchain(config_file=DEFAULT_CONFIG_FILE)
config_file += '.yml' unless config_file =~ /\.yml$/
config_file = "targets/#{config_file}" unless config_file =~ /[\\|\/]/
config_file = config_file unless config_file =~ /[\\|\/]/
load_configuration(config_file)
configure_clean
end
@ -205,8 +205,7 @@ module RakefileHelpers
runner_path = $cfg['compiler']['runner_path'] + runner_name
end
#UnityTestRunnerGenerator.new(:suite_setup => 'puts("\nStarting Test Suite!\n");', :suite_teardown => 'return num_failures;').run(test, runner_path)
UnityTestRunnerGenerator.new.run(test, runner_path)
UnityTestRunnerGenerator.new($cfg_file).run(test, runner_path)
compile(runner_path, test_defines)
obj_list << runner_name.ext($cfg['compiler']['object_files']['extension'])