Fixed/cleaned up require paths in make support scripts.

This commit is contained in:
Greg Williams
2015-04-07 19:55:16 -04:00
parent a86c281824
commit 89724069fb
6 changed files with 7 additions and 22 deletions
+2 -4
View File
@@ -1,10 +1,8 @@
require 'cmock'
require 'fileutils'
abs_root = FileUtils.pwd
cmock_dir = File.expand_path(ENV.fetch('CMOCK_DIR', File.join(abs_root, '..', '..')))
puts "___CMOCK: #{cmock_dir}"
require "#{cmock_dir}/lib/cmock"
unity_dir = File.join(cmock_dir, 'vendor', 'unity')
puts "___UNITY: #{unity_dir}"
require "#{unity_dir}/auto/generate_test_runner"
src_dir = ENV.fetch('SRC_DIR', './src')
@@ -126,7 +124,7 @@ File.open(test_makefile, "w") do |mkfile|
# Run test suite and generate report
mkfile.puts "#{test_results}: #{test_bin}"
mkfile.puts "\t#{test_bin} &> #{test_results}"
mkfile.puts "\t-#{test_bin} &> #{test_results}"
mkfile.puts ""
test_targets << test_bin