From c4cd7d54a917ba374144789fad4b816686b5d2a1 Mon Sep 17 00:00:00 2001 From: Stein Heselmans Date: Mon, 11 Sep 2017 14:24:40 +0200 Subject: [PATCH 1/4] create_makefile : add support for suffix --- scripts/create_makefile.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/create_makefile.rb b/scripts/create_makefile.rb index c9cf723..dfa0b63 100644 --- a/scripts/create_makefile.rb +++ b/scripts/create_makefile.rb @@ -18,8 +18,9 @@ RUNNERS_DIR = File.join(TEST_BUILD_DIR, 'runners') MOCKS_DIR = File.join(TEST_BUILD_DIR, 'mocks') TEST_BIN_DIR = TEST_BUILD_DIR MOCK_PREFIX = ENV.fetch('TEST_MOCK_PREFIX', 'mock_') +MOCK_SUFFIX = ENV.fetch('TEST_MOCK_SUFFIX', '') TEST_MAKEFILE = ENV.fetch('TEST_MAKEFILE', File.join(TEST_BUILD_DIR, 'MakefileTestSupport')) -MOCK_MATCHER = /#{MOCK_PREFIX}[A-Za-z_][A-Za-z0-9_\-\.]+/ +MOCK_MATCHER = /#{MOCK_PREFIX}[A-Za-z_][A-Za-z0-9_\-\.]+#{MOCK_SUFFIX}/ [TEST_BUILD_DIR, OBJ_DIR, RUNNERS_DIR, MOCKS_DIR, TEST_BIN_DIR].each do |dir| FileUtils.mkdir_p dir @@ -58,7 +59,7 @@ File.open(TEST_MAKEFILE, "w") do |mkfile| test_sources = Dir["#{TEST_DIR}/**/test_*.c"] test_targets = [] generator = UnityTestRunnerGenerator.new - all_headers = Dir["#{SRC_DIR}/**/{[!mock_]}*.h"] #headers that begin with mock_ are not included + all_headers = Dir["#{SRC_DIR}/**/*.h"].reject{ |f| f["/#{MOCK_PREFIX}"] || f["#{MOCK_SUFFIX}.h"]} #headers that begin with suffix or end with suffix are not included makefile_targets = [] test_sources.each do |test| From 725641409bf0b8b9ffc577001f2e0828e6d04218 Mon Sep 17 00:00:00 2001 From: Stein Heselmans Date: Mon, 11 Sep 2017 14:25:14 +0200 Subject: [PATCH 2/4] Fix path issue in create makefile --- scripts/create_makefile.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create_makefile.rb b/scripts/create_makefile.rb index dfa0b63..ea785de 100644 --- a/scripts/create_makefile.rb +++ b/scripts/create_makefile.rb @@ -1,6 +1,6 @@ require 'fileutils' ABS_ROOT = FileUtils.pwd -CMOCK_DIR = File.expand_path(ENV.fetch('CMOCK_DIR', File.join(ABS_ROOT, '..', '..'))) +CMOCK_DIR = File.expand_path(ENV.fetch('CMOCK_DIR', File.join(ABS_ROOT, '..'))) require "#{CMOCK_DIR}/lib/cmock" UNITY_DIR = File.join(CMOCK_DIR, 'vendor', 'unity') require "#{UNITY_DIR}/auto/generate_test_runner" From 9a44444f8b632ce1c9fda274996f6b28b0c53cb2 Mon Sep 17 00:00:00 2001 From: Stein Heselmans Date: Mon, 11 Sep 2017 14:46:45 +0200 Subject: [PATCH 3/4] Revert "Fix path issue in create makefile" This reverts commit 725641409bf0b8b9ffc577001f2e0828e6d04218. --- scripts/create_makefile.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create_makefile.rb b/scripts/create_makefile.rb index ea785de..dfa0b63 100644 --- a/scripts/create_makefile.rb +++ b/scripts/create_makefile.rb @@ -1,6 +1,6 @@ require 'fileutils' ABS_ROOT = FileUtils.pwd -CMOCK_DIR = File.expand_path(ENV.fetch('CMOCK_DIR', File.join(ABS_ROOT, '..'))) +CMOCK_DIR = File.expand_path(ENV.fetch('CMOCK_DIR', File.join(ABS_ROOT, '..', '..'))) require "#{CMOCK_DIR}/lib/cmock" UNITY_DIR = File.join(CMOCK_DIR, 'vendor', 'unity') require "#{UNITY_DIR}/auto/generate_test_runner" From fb96bb3033e69d76a973005e9a0a34f5dd927df9 Mon Sep 17 00:00:00 2001 From: Stein Heselmans Date: Mon, 11 Sep 2017 19:45:42 +0200 Subject: [PATCH 4/4] Try to fix CI --- scripts/create_makefile.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create_makefile.rb b/scripts/create_makefile.rb index dfa0b63..1fa6164 100644 --- a/scripts/create_makefile.rb +++ b/scripts/create_makefile.rb @@ -59,7 +59,7 @@ File.open(TEST_MAKEFILE, "w") do |mkfile| test_sources = Dir["#{TEST_DIR}/**/test_*.c"] test_targets = [] generator = UnityTestRunnerGenerator.new - all_headers = Dir["#{SRC_DIR}/**/*.h"].reject{ |f| f["/#{MOCK_PREFIX}"] || f["#{MOCK_SUFFIX}.h"]} #headers that begin with suffix or end with suffix are not included + all_headers = Dir["#{SRC_DIR}/**/{[!#{MOCK_PREFIX}]}*{[!#{MOCK_SUFFIX}]}.h"] #headers that begin with prefix or end with suffix are not included makefile_targets = [] test_sources.each do |test|