From 89724069fbc7715977b190e999415ef700fecc1c Mon Sep 17 00:00:00 2001
From: Greg Williams <greg.williams@atomicobject.com>
Date: Tue, 7 Apr 2015 19:55:05 -0400
Subject: [PATCH] Fixed/cleaned up require paths in make support scripts.

---
 .gitignore                     |  1 +
 examples/make_example/Makefile |  2 --
 scripts/create_makefile.rb     |  6 ++----
 scripts/create_mock.rb         |  2 +-
 scripts/create_runner.rb       | 14 ++------------
 scripts/test_summary.rb        |  4 +---
 6 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index bd6ddd0..47dec9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ test/system/generated
 Gemfile.lock
 .rake_t_cache
 .DS_Store
+examples/make_example/build
diff --git a/examples/make_example/Makefile b/examples/make_example/Makefile
index 1403e4e..56385ae 100644
--- a/examples/make_example/Makefile
+++ b/examples/make_example/Makefile
@@ -2,8 +2,6 @@ CC ?= gcc
 BUILD_DIR ?= ./build
 SRC_DIR ?= ./src
 TEST_DIR ?= ./test
-#UNITY_DIR ?= ../../vendor/cmock/vendor/unity
-#CMOCK_DIR ?= ../..
 TEST_BUILD_DIR ?= ${BUILD_DIR}/test
 TEST_MAKEFILE = ${TEST_BUILD_DIR}/MakefileTestSupport
 OBJ ?= ${BUILD_DIR}/obj
diff --git a/scripts/create_makefile.rb b/scripts/create_makefile.rb
index 90fa06d..0c49e90 100644
--- a/scripts/create_makefile.rb
+++ b/scripts/create_makefile.rb
@@ -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
diff --git a/scripts/create_mock.rb b/scripts/create_mock.rb
index b5d6505..389444e 100644
--- a/scripts/create_mock.rb
+++ b/scripts/create_mock.rb
@@ -1,4 +1,4 @@
-require 'cmock'
+require "#{ENV['CMOCK_DIR']}/lib/cmock"
 
 raise "Header file to mock must be specified!" unless ARGV.length >= 1
 
diff --git a/scripts/create_runner.rb b/scripts/create_runner.rb
index 4b2ad83..82ceada 100644
--- a/scripts/create_runner.rb
+++ b/scripts/create_runner.rb
@@ -11,20 +11,10 @@ if ($0 == __FILE__)
     exit 1
   end
 
-  require 'cmock'
-  require 'fileutils'
-  src_dir =  ENV.fetch('SRC_DIR',  './src')
-  test_dir = ENV.fetch('TEST_DIR', './test')
-  runners_dir = ENV.fetch('RUNNERS_DIR', './build/runners')
-  puts "UNITY_DIR_CREATE_RUNNER: #{ENV['UNITY_DIR']}"
-  unity_dir = ENV['UNITY_DIR']
-  require "#{unity_dir}/auto/generate_test_runner"
+  require "#{ENV['UNITY_DIR']}/auto/generate_test_runner"
 
   test = ARGV[0]
   runner = ARGV[1]
-
-  generator = UnityTestRunnerGenerator.new
-
-  generator.run(test, runner)
+  generator = UnityTestRunnerGenerator.new.run(test, runner)
 
 end
diff --git a/scripts/test_summary.rb b/scripts/test_summary.rb
index bfed3c6..6192263 100644
--- a/scripts/test_summary.rb
+++ b/scripts/test_summary.rb
@@ -1,12 +1,10 @@
-require 'cmock'
-require 'fileutils'
 require "#{ENV['UNITY_DIR']}/auto/unity_test_summary.rb"
 
 build_dir = ENV.fetch('BUILD_DIR', './build')
 test_build_dir = ENV.fetch('TEST_BUILD_DIR', File.join(build_dir, 'test'))
 
-parser = UnityTestSummary.new
 results = Dir["#{test_build_dir}/*.result"]
+parser = UnityTestSummary.new
 parser.set_targets(results)
 parser.run
 puts parser.report