Added directory task to create temp build/ folder, and added .gitignore to prevent this new folder form being tracked by git.

This commit is contained in:
Greg Williams
2012-02-13 08:44:04 -05:00
parent d0d5ec5d75
commit 17663feed2
3 changed files with 20 additions and 8 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
build/

View File

@ -4,12 +4,23 @@
# [Released under MIT License. Please refer to license.txt for details] # [Released under MIT License. Please refer to license.txt for details]
# ========================================== # ==========================================
HERE = File.expand_path(File.dirname(__FILE__)) + '/' UNITY_ROOT = File.expand_path(File.dirname(__FILE__)) + '/'
require 'rake' require 'rake'
require 'rake/clean' require 'rake/clean'
require 'rake/testtask' require 'rake/testtask'
require HERE + 'rakefile_helper' require UNITY_ROOT + 'rakefile_helper'
TEMP_DIRS = [
File.join(UNITY_ROOT, 'build')
]
TEMP_DIRS.each do |dir|
directory(dir)
CLOBBER.include(dir)
end
task :prepare_for_tests => TEMP_DIRS
include RakefileHelpers include RakefileHelpers
@ -18,7 +29,7 @@ DEFAULT_CONFIG_FILE = 'gcc.yml'
configure_toolchain(DEFAULT_CONFIG_FILE) configure_toolchain(DEFAULT_CONFIG_FILE)
desc "Test unity with its own unit tests" desc "Test unity with its own unit tests"
task :unit do task :unit => [:prepare_for_tests] do
run_tests get_unit_test_files run_tests get_unit_test_files
end end
@ -33,7 +44,7 @@ task :summary do
end end
desc "Build and test Unity" desc "Build and test Unity"
task :all => [:clean, :scripts, :unit, :summary] task :all => [:clean, :prepare_for_tests, :scripts, :unit, :summary]
task :default => [:clobber, :all] task :default => [:clobber, :all]
task :ci => [:no_color, :default] task :ci => [:no_color, :default]
task :cruise => [:no_color, :default] task :cruise => [:no_color, :default]

View File

@ -6,9 +6,9 @@
require 'yaml' require 'yaml'
require 'fileutils' require 'fileutils'
require HERE+'auto/unity_test_summary' require UNITY_ROOT + 'auto/unity_test_summary'
require HERE+'auto/generate_test_runner' require UNITY_ROOT + 'auto/generate_test_runner'
require HERE+'auto/colour_reporter' require UNITY_ROOT + 'auto/colour_reporter'
module RakefileHelpers module RakefileHelpers
@ -163,7 +163,7 @@ module RakefileHelpers
def report_summary def report_summary
summary = UnityTestSummary.new summary = UnityTestSummary.new
summary.set_root_path(HERE) summary.set_root_path(UNITY_ROOT )
results_glob = "#{$cfg['compiler']['build_path']}*.test*" results_glob = "#{$cfg['compiler']['build_path']}*.test*"
results_glob.gsub!(/\\/, '/') results_glob.gsub!(/\\/, '/')
results = Dir[results_glob] results = Dir[results_glob]