diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index c9f67f8fe57e11c04a7d744ef33b7a8db76dfde5..3eb1d212bbe05ca5c20e6517ee7e9289e0965ad2 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -93,8 +93,11 @@ class UnityTestRunnerGenerator output.puts('#include "BullseyeCoverage.h"') if @options[:coverage] output.puts('') output.puts('char MessageBuffer[50];') - output.puts('int GlobalExpectCount;') if @options[:order] - output.puts('int GlobalVerifyOrder;') if @options[:order] + if @options[:order] + output.puts('int GlobalExpectCount;') + output.puts('int GlobalVerifyOrder;') + output.puts('char* GlobalOrderError;') + end end @@ -118,8 +121,11 @@ class UnityTestRunnerGenerator unless (mocks.empty?) output.puts("static void CMock_Init(void)") output.puts("{") - output.puts("#{@tab}GlobalExpectCount = 0;") if @options[:order] - output.puts("#{@tab}GlobalVerifyOrder = 0;") if @options[:order] + if @options[:order] + output.puts("#{@tab}GlobalExpectCount = 0;") + output.puts("#{@tab}GlobalVerifyOrder = 0;") + output.puts("#{@tab}GlobalOrderError = NULL;") + end mocks.each do |mock| output.puts("#{@tab}#{mock}_Init();") end