Merge branch 'master' into windows_binary_packages

1 files changed, 7 insertions, 5 deletions

diff --git a/test/common/testcommon.cpp b/test/common/testcommon.cpp
index 3de7da1d..cba40fe7 100644
--- a/test/common/testcommon.cpp
+++ b/test/common/testcommon.cpp
@@ -313,16 +313,18 @@ int test(int argc, const char *argv[])
 	// throws an assertion failure. Can only do this in debug mode
 	#ifndef BOX_RELEASE_BUILD
 	{
+		TEST_CHECK_THROWS(Timers::Cleanup(), CommonException,
+			AssertFailed);
+
 		Timer tim(0, "tim");
 		TEST_CHECK_THROWS(Timers::Add(tim), CommonException, AssertFailed);
 		Timers::Remove(tim);
-	}
-	#endif
 
-	// TEST_CHECK_THROWS(Timers::Signal(), CommonException, AssertFailed);
-	#ifndef BOX_RELEASE_BUILD
-		TEST_CHECK_THROWS(Timers::Cleanup(), CommonException,
+		TEST_CHECK_THROWS(Timer t1(900, "t1"), CommonException,
 			AssertFailed);
+	
+		// TEST_CHECK_THROWS(Timers::Signal(), CommonException, AssertFailed);
+	}
 	#endif
 	
 	// Check that we can initialise the timers