From 9c5213f10414d2e06ee37ad41c2a8ce8cfce345c Mon Sep 17 00:00:00 2001 From: greg-williams Date: Thu, 20 Nov 2008 19:58:09 +0000 Subject: [PATCH] * Fixed hang upon CMock mock verification detecting a failure git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@10 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e --- auto/generate_test_runner.rb | 2 +- rakefile.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 4c31ca8..2753958 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -131,8 +131,8 @@ class UnityTestRunnerGenerator output.puts("#{@tab}#{@tab}CMock_Init();") unless (used_mocks.empty?) output.puts("#{@tab}#{@tab}setUp();") output.puts("#{@tab}#{@tab}test();") + output.puts("#{@tab}#{@tab}CMock_Verify();") unless (used_mocks.empty?) output.puts("#{@tab}}") - output.puts("#{@tab}CMock_Verify();") unless (used_mocks.empty?) output.puts("#{@tab}CMock_Destroy();") unless (used_mocks.empty?) output.puts("#{@tab}tearDown();") output.puts("}") diff --git a/rakefile.rb b/rakefile.rb index 5476918..cd31dea 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -7,10 +7,10 @@ require 'set' require 'auto/unity_test_summary' #USE THIS ONE IF YOU WANT TO TRY THIS WITH GCC -require 'rakefile_helper_GCC' +#require 'rakefile_helper_GCC' #USE THIS ONE IF YOU WANT TO TRY THIS WITH IAR -#require 'rakefile_helper_IAR' +require 'rakefile_helper_IAR' include RakefileHelpers -- GitLab