From 39654f36e87fbe31253828229fb8b44cf2e9fa07 Mon Sep 17 00:00:00 2001
From: mvandervoord <mvandervoord@e7d17a6e-8845-0410-bbbc-c8efb4fdad7e>
Date: Fri, 15 Apr 2011 01:01:39 +0000
Subject: [PATCH] - separated generate step in test runner generator
git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@128 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
---
auto/generate_test_runner.rb | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb
index 40d73c6..c802022 100644
--- a/auto/generate_test_runner.rb
+++ b/auto/generate_test_runner.rb
@@ -45,6 +45,16 @@ class UnityTestRunnerGenerator
end
#build runner file
+ generate(input_file, output_file, tests, includes, used_mocks)
+
+ #determine which files were used to return them
+ all_files_used = [input_file, output_file]
+ all_files_used += includes.map {|filename| filename + '.c'} unless includes.empty?
+ all_files_used += @options[:includes] unless @options[:includes].empty?
+ return all_files_used.uniq
+ end
+
+ def generate(input_file, output_file, tests, includes, used_mocks)
File.open(output_file, 'w') do |output|
create_header(output, used_mocks)
create_externs(output, tests, used_mocks)
@@ -53,11 +63,6 @@ class UnityTestRunnerGenerator
create_reset(output, used_mocks)
create_main(output, input_file, tests)
end
-
- all_files_used = [input_file, output_file]
- all_files_used += includes.map {|filename| filename + '.c'} unless includes.empty?
- all_files_used += @options[:includes] unless @options[:includes].empty?
- return all_files_used.uniq
end
def find_tests(input_file)