From 64939db64e3271808fdfcfa348120b36790a23cf Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Fri, 19 Jan 2024 11:44:48 -0500 Subject: [PATCH] generate test runner: clean injected defines so the ifndef doesn't use the assignment when it exists. --- auto/generate_test_runner.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 057c02fb..102f6f30 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -239,7 +239,11 @@ def create_header(output, mocks, testfile_includes = []) output.puts('#include "cmock.h"') unless mocks.empty? output.puts('}') if @options[:externcincludes] if @options[:defines] && !@options[:defines].empty? - @options[:defines].each { |d| output.puts("#ifndef #{d}\n#define #{d}\n#endif /* #{d} */") } + output.puts("/* injected defines for unity settings, etc */") + @options[:defines].each do |d| + def_only = d.match(/(\w+).*/)[1] + output.puts("#ifndef #{def_only}\n#define #{d}\n#endif /* #{def_only} */") + end end if @options[:header_file] && !@options[:header_file].empty? output.puts("#include \"#{File.basename(@options[:header_file])}\"")