r26 | charles.nicholson | 2010-03-22 14:16:24 -0500 (Mon, 22 Mar 2010) | 1 line

pjohnmeyer · pjohnmeyer · commit 3fe7f2f5bdf8 · 2013-01-09T23:45:16.000-06:00
platform macros for jmp_buf, setjmp, longjmp.  Remove unused code, fix shadowed virtual functions (yikes!)
diff --git a/config.h b/config.h
@@ -51,5 +51,4 @@
 
 //#define UNITTEST_NO_EXCEPTIONS
 
-
 #endif
diff --git a/src/HelperMacros.h b/src/HelperMacros.h
@@ -39,4 +39,14 @@
 	#define UNITTEST_STDVECTOR_LINKAGE(T)
 #endif
 
+#ifdef UNITTEST_WIN32
+	#define UNITTEST_JMPBUF jmp_buf
+	#define UNITTEST_SETJMP setjmp
+	#define UNITTEST_LONGJMP longjmp
+#elif defined UNITTEST_POSIX
+	#define UNITTEST_JMPBUF std::jmp_buf
+	#define UNITTEST_SETJMP setjmp
+	#define UNITTEST_LONGJMP std::longjmp
+#endif
+
 #endif
diff --git a/src/ReportAssert.cpp b/src/ReportAssert.cpp
@@ -29,9 +29,9 @@ UNITTEST_LINKAGE void ReportAssert(char const* description, char const* filename
 namespace Detail {
 
 #ifdef UNITTEST_NO_EXCEPTIONS
-jmp_buf* GetAssertJmpBuf()
+UNITTEST_JMPBUF* GetAssertJmpBuf()
 {
-	static jmp_buf s_jmpBuf;
+	static UNITTEST_JMPBUF s_jmpBuf;
 	return &s_jmpBuf;
 }
 #endif
diff --git a/src/ReportAssertImpl.h b/src/ReportAssertImpl.h
@@ -2,6 +2,7 @@
 #define UNITTEST_REPORTASSERTIMPL_H
 
 #include "../config.h"
+#include "HelperMacros.h"
 
 #ifdef UNITTEST_NO_EXCEPTIONS
 	#include <csetjmp>
@@ -25,18 +26,18 @@ UNITTEST_LINKAGE void ReportAssertEx(TestResults* testResults,
 UNITTEST_LINKAGE bool AssertExpected();
 
 #ifdef UNITTEST_NO_EXCEPTIONS
-	UNITTEST_LINKAGE jmp_buf* GetAssertJmpBuf();
+	UNITTEST_LINKAGE UNITTEST_JMPBUF* GetAssertJmpBuf();
 
 	#ifdef UNITTEST_WIN32
 		#define UNITTEST_SET_ASSERT_JUMP_TARGET() \
 			__pragma(warning(push)) __pragma(warning(disable:4611)) \
-			setjmp(*UnitTest::Detail::GetAssertJmpBuf()) \
+			UNITTEST_SETJMP(*UnitTest::Detail::GetAssertJmpBuf()) \
 			__pragma(warning(pop))
 	#else
-		#define UNITTEST_SET_ASSERT_JUMP_TARGET() setjmp(*UnitTest::Detail::GetAssertJmpBuf())
+		#define UNITTEST_SET_ASSERT_JUMP_TARGET() UNITTEST_SETJMP(*UnitTest::Detail::GetAssertJmpBuf())
 	#endif
 
-	#define UNITTEST_JUMP_TO_ASSERT_JUMP_TARGET() longjmp(*UnitTest::Detail::GetAssertJmpBuf(), 1)
+	#define UNITTEST_JUMP_TO_ASSERT_JUMP_TARGET() UNITTEST_LONGJMP(*UnitTest::Detail::GetAssertJmpBuf(), 1)
 #endif
 
 }
diff --git a/src/tests/TestExceptions.cpp b/src/tests/TestExceptions.cpp
@@ -226,14 +226,6 @@ TEST(CheckArrayEqualFailureOnExceptionIncludesCheckContents)
     CHECK(strstr(reporter.lastFailedMessage, "obj"));
 }
 
-int g_sideEffect = 0;
-float const* FunctionWithSideEffects2()
-{
-    ++g_sideEffect;
-    static float const data[] = {1,2,3,4};
-    return data;
-}
-
 class ThrowingObject2D
 {
 public:
diff --git a/src/tests/TestTestRunner.cpp b/src/tests/TestTestRunner.cpp
@@ -81,7 +81,7 @@ class SlowTest : public Test
 {
 public:
     SlowTest() : Test("slow", "somesuite", "filename", 123) {}
-    virtual void RunImpl(TestResults&) const
+    virtual void RunImpl() const
     {
         TimeHelpers::SleepMs(20);
     }
@@ -213,7 +213,7 @@ TEST_FIXTURE(TestRunnerFixture, SlowTestWithTimeExemptionPasses)
     {
     public:
         SlowExemptedTest() : Test("slowexempted", "", 0) {}
-        virtual void RunImpl(TestResults&) const
+        virtual void RunImpl() const
         {
             UNITTEST_TIME_CONSTRAINT_EXEMPT();
             TimeHelpers::SleepMs(20);

Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,4 @@`
`51`	`51`
`52`	`52`	`//#define UNITTEST_NO_EXCEPTIONS`
`53`	`53`
`54`		`-`
`55`	`54`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ UNITTEST_LINKAGE void ReportAssert(char const* description, char const* filename`
`29`	`29`	`namespace Detail {`
`30`	`30`
`31`	`31`	`#ifdef UNITTEST_NO_EXCEPTIONS`
`32`		`-jmp_buf* GetAssertJmpBuf()`
	`32`	`+UNITTEST_JMPBUF* GetAssertJmpBuf()`
`33`	`33`	`{`
`34`		`- static jmp_buf s_jmpBuf;`
	`34`	`+ static UNITTEST_JMPBUF s_jmpBuf;`
`35`	`35`	`return &s_jmpBuf;`
`36`	`36`	`}`
`37`	`37`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -226,14 +226,6 @@ TEST(CheckArrayEqualFailureOnExceptionIncludesCheckContents)`
`226`	`226`	`CHECK(strstr(reporter.lastFailedMessage, "obj"));`
`227`	`227`	`}`
`228`	`228`
`229`		`-int g_sideEffect = 0;`
`230`		`-float const* FunctionWithSideEffects2()`
`231`		`-{`
`232`		`- ++g_sideEffect;`
`233`		`- static float const data[] = {1,2,3,4};`
`234`		`- return data;`
`235`		`-}`
`236`		`-`
`237`	`229`	`class ThrowingObject2D`
`238`	`230`	`{`
`239`	`231`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class SlowTest : public Test`
`81`	`81`	`{`
`82`	`82`	`public:`
`83`	`83`	`SlowTest() : Test("slow", "somesuite", "filename", 123) {}`
`84`		`- virtual void RunImpl(TestResults&) const`
	`84`	`+ virtual void RunImpl() const`
`85`	`85`	`{`
`86`	`86`	`TimeHelpers::SleepMs(20);`
`87`	`87`	`}`
`@@ -213,7 +213,7 @@ TEST_FIXTURE(TestRunnerFixture, SlowTestWithTimeExemptionPasses)`
`213`	`213`	`{`
`214`	`214`	`public:`
`215`	`215`	`SlowExemptedTest() : Test("slowexempted", "", 0) {}`
`216`		`- virtual void RunImpl(TestResults&) const`
	`216`	`+ virtual void RunImpl() const`
`217`	`217`	`{`
`218`	`218`	`UNITTEST_TIME_CONSTRAINT_EXEMPT();`
`219`	`219`	`TimeHelpers::SleepMs(20);`