- revert last change until I figure out what I screwed up

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

src/unity.c

@@ -790,26 +790,6 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
     UNITY_IGNORE_AND_BAIL;
 }
 
-//-----------------------------------------------
-void setUp(void);
-void tearDown(void);
-void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)
-{
-    Unity.CurrentTestName = FuncName;
-    Unity.CurrentTestLineNumber = FuncLineNum;
-    Unity.NumberOfTests++; 
-    if (TEST_PROTECT())
-    {
-        setUp();
-        Func();
-    }
-    if (TEST_PROTECT() && !(Unity.CurrentTestIgnored))
-    {
-        tearDown();
-    }
-    UnityConcludeTest();
-}
-
 //-----------------------------------------------
 void UnityBegin(void)
 {

src/unity.h

@@ -40,9 +40,12 @@
 
 #define TEST_ABORT() {longjmp(Unity.AbortFrame, 1);}
 
-#ifndef RUN_TEST
-#define RUN_TEST(func, line_num) UnityDefaultTestRun(func, #func, line_num)
-#endif
+#define RUN_TEST(func, line_num) \
+    Unity.CurrentTestName = #func; \
+    Unity.CurrentTestLineNumber = line_num; \
+    Unity.NumberOfTests++; \
+    runTest(func); \
+    UnityConcludeTest();
 
 #define TEST_LINE_NUM (Unity.CurrentTestLineNumber)
 #define TEST_IS_IGNORED (Unity.CurrentTestIgnored)

src/unity_internals.h

@@ -189,7 +189,6 @@ extern struct _Unity Unity;
 void UnityBegin(void);
 int  UnityEnd(void);
 void UnityConcludeTest(void);
-void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum);
 
 //-------------------------------------------------------
 // Test Output