提交 4f2de8c8 编写于 作者: M mvandervoord

- now compat with Ruby 1.9.2

git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@99 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
上级 a1ed0dec
......@@ -251,8 +251,10 @@ if ($0 == __FILE__)
#parse out all the options first
ARGV.reject! do |arg|
case(arg)
when '-cexception': options[:plugins] = [:cexception]; true
when /\w+\.yml/: options = UnityTestRunnerGenerator.grab_config(arg); true
when '-cexception'
options[:plugins] = [:cexception]; true
when /\w+\.yml/
options = UnityTestRunnerGenerator.grab_config(arg); true
else false
end
end
......
HERE = File.expand_path(File.dirname(__FILE__)) + '/'
#require HERE + 'config/environment'
require 'rake'
require 'rake/clean'
require 'rake/testtask'
require 'rakefile_helper'
require HERE+'rakefile_helper'
include RakefileHelpers
......
require 'yaml'
require 'fileutils'
require '../auto/unity_test_summary'
require '../auto/generate_test_runner'
require '../auto/colour_reporter'
require HERE+'../auto/unity_test_summary'
require HERE+'../auto/generate_test_runner'
require HERE+'../auto/colour_reporter'
module RakefileHelpers
......@@ -157,7 +157,7 @@ module RakefileHelpers
results = Dir[results_glob]
summary.set_targets(results)
summary.run
raise "There were failures" if (summary.failures > 0)
fail_out "FAIL: There were failures" if (summary.failures > 0)
end
def run_tests(test_files)
......@@ -253,4 +253,8 @@ module RakefileHelpers
link(main_base, obj_list)
end
def fail_out(msg)
puts msg
exit(-1)
end
end
......@@ -6,11 +6,10 @@
HERE = File.expand_path(File.dirname(__FILE__)) + '/'
#require HERE + 'config/environment'
require 'rake'
require 'rake/clean'
require 'rake/testtask'
require 'rakefile_helper'
require HERE + 'rakefile_helper'
include RakefileHelpers
......
......@@ -6,10 +6,9 @@
require 'yaml'
require 'fileutils'
require 'auto/unity_test_summary'
require 'auto/generate_test_runner'
require 'auto/colour_reporter'
#require 'auto/test_file_filter'
require HERE+'auto/unity_test_summary'
require HERE+'auto/generate_test_runner'
require HERE+'auto/colour_reporter'
module RakefileHelpers
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册