From 432e6313f8b22e646deccc67e48f59a1764762eb Mon Sep 17 00:00:00 2001 From: mvandervoord Date: Wed, 24 Jun 2009 02:27:01 +0000 Subject: [PATCH] - finished strict ordering support git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@34 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e --- auto/generate_test_runner.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index c9f67f8..3eb1d21 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