From ba87d27b7797790b92158273d7f4a5feb567249e Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Tue, 21 Jul 2015 07:35:29 -0400 Subject: [PATCH] - switch to old-school hash notation to be backwards compatible with older versions of ruby --- auto/generate_test_runner.rb | 4 ++-- test/rakefile_helper.rb | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 85e4e91..7caf1bd 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -130,8 +130,8 @@ class UnityTestRunnerGenerator #parse out includes includes = { - local: source.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/).flatten, - system: source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" } + :local => source.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/).flatten, + :system => source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" } } return includes end diff --git a/test/rakefile_helper.rb b/test/rakefile_helper.rb index 75ed7aa..a5ae51e 100644 --- a/test/rakefile_helper.rb +++ b/test/rakefile_helper.rb @@ -195,6 +195,12 @@ module RakefileHelpers test_files.each do |test| obj_list = [] + if !$cfg['compiler']['aux_sources'].nil? + $cfg['compiler']['aux_sources'].each do |aux| + obj_list << compile(aux, test_defines) + end + end + # Detect dependencies and build required modules extract_headers(test).each do |header| # Compile corresponding source file if it exists