* Updated frame to not require separate pointer initialization

* Updated test runner to protect teardown (just in case someone tries to put ASSERTS in their teardown function)

git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@13 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e

auto/generate_test_runner.rb

@@ -1,8 +1,9 @@
 
 class UnityTestRunnerGenerator
 
-  def run(input_file, output_file, additional_includes=[], tab='  ')
+  def run(input_file, output_file, additional_includes=[], tab='  ', options={})
     @tab = tab
+    @options = options
     tests = []
     includes = []
     used_mocks = []
@@ -74,8 +75,8 @@ class UnityTestRunnerGenerator
     end
     output.puts('#include <setjmp.h>')
     output.puts('#include <stdio.h>')
-    output.puts('')
+    output.puts('#include "Exception.h"') if @options.include?(:cexception)
-    output.puts('jmp_buf AbortFrame;')
+    output.puts('#include "BullseyeCoverage.h"') if @options.include?(:coverage)
     output.puts('')    
     output.puts('char MessageBuffer[50];')
   end
@@ -128,13 +129,19 @@ class UnityTestRunnerGenerator
     output.puts("{")
     output.puts("#{@tab}if (TEST_PROTECT())")
     output.puts("#{@tab}{")
-    output.puts("#{@tab}#{@tab}CMock_Init();") unless (used_mocks.empty?) 
+    output.puts("#{@tab}#{@tab}EXCEPTION_T e;") if @options.include?(:cexception)
-    output.puts("#{@tab}#{@tab}setUp();")
+    output.puts("#{@tab}#{@tab}Try {") if @options.include?(:cexception)
-    output.puts("#{@tab}#{@tab}test();")
+    output.puts("#{@tab}#{@tab}#{@tab}CMock_Init();") unless (used_mocks.empty?) 
-    output.puts("#{@tab}#{@tab}CMock_Verify();") unless (used_mocks.empty?)
+    output.puts("#{@tab}#{@tab}#{@tab}setUp();")
+    output.puts("#{@tab}#{@tab}#{@tab}test();")
+    output.puts("#{@tab}#{@tab}#{@tab}CMock_Verify();") unless (used_mocks.empty?)
+    output.puts("#{@tab}#{@tab}} Catch(e) { TEST_FAIL(\"Unhandled Exception!\"); }") if @options.include?(:cexception)
     output.puts("#{@tab}}")
     output.puts("#{@tab}CMock_Destroy();") unless (used_mocks.empty?)
-    output.puts("#{@tab}tearDown();")
+    output.puts("#{@tab}if (TEST_PROTECT())")
+    output.puts("#{@tab}{")
+    output.puts("#{@tab}#{@tab}tearDown();")
+    output.puts("#{@tab}}")
     output.puts("}")
   end
   
@@ -155,6 +162,7 @@ class UnityTestRunnerGenerator
 
     output.puts()
     output.puts("#{@tab}UnityEnd();")
+    output.puts("#{@tab}cov_write();") if @options.include?(:coverage)
     output.puts("#{@tab}return 0;")
     output.puts("}")
   end
@@ -170,7 +178,7 @@ if ($0 == __FILE__)
     exit 1
   end
   
-  ARGV[1] = ARGV[0].gsub(".c","_sRunner.c") if (!ARGV[1])
+  ARGV[1] = ARGV[0].gsub(".c","_Runner.c") if (!ARGV[1])
   
   includes = []
   includes = ARGV.slice(2..-1) if (ARGV.size > 2)

src/unity.h

@@ -27,7 +27,6 @@ struct _Unity
     unsigned char CurrentTestIgnored;
     const char *TestFile;
     float DefaultDelta;
-    jmp_buf* volatile pAbortFrame;
     jmp_buf AbortFrame;
 };
 
@@ -67,16 +66,15 @@ void UnityFail(const char *message, int line);
 
 void UnityIgnore(const char *message, int line);
 
-#define TEST_PROTECT() (setjmp(*Unity.pAbortFrame) == 0)
+#define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0)
 
-#define TEST_ABORT() {longjmp(*Unity.pAbortFrame, 1);}
+#define TEST_ABORT() {longjmp(Unity.AbortFrame, 1);}
 
 #define ABORT_IF_NECESSARY() \
     if( Unity.CurrentTestFailed || Unity.CurrentTestIgnored ) {TEST_ABORT();}
 
 #define RUN_TEST(func) \
     Unity.CurrentTestName = #func; \
-    Unity.pAbortFrame = &Unity.AbortFrame; \
     Unity.NumberOfTests ++; \
     runTest(func); \
     UnityConcludeTest();

test/testunity.c

@@ -5,14 +5,11 @@
 
 #define EXPECT_ABORT_BEGIN \
   { \
-    jmp_buf NewFrame, *PrevFrame = Unity.pAbortFrame; \
-    Unity.pAbortFrame = &NewFrame; \
     if (TEST_PROTECT()) \
     {
 
 #define EXPECT_ABORT_END \
     } \
-    Unity.pAbortFrame = PrevFrame; \
   }
 
 void setUp(void)

test/testunity_Runner.c

@@ -53,7 +53,11 @@ static void runTest(UnityTestFunction test)
     setUp();
     test();
   }
-  tearDown();
+  
+  if (TEST_PROTECT())
+  {
+    tearDown();
+  }
 }
 
 int main(void)