Backport Timers::Cleanup that's safe to use in test cleanup.

Allows it not to throw an exception if timers weren't initialised when
cleanup was requested. Normally we want an exception thrown, but not while
we're cleaning up a test that might have failed with timers uninitialised.

More timers fixes after cleanup no-exception option.

Merged back changes from the test refactor branch to reduce diffs.

1 files changed, 2 insertions, 1 deletions

diff --git a/lib/common/Timer.h b/lib/common/Timer.h
index 09be58fa..68592aaa 100644
--- a/lib/common/Timer.h
+++ b/lib/common/Timer.h
@@ -43,7 +43,8 @@ class Timers
 
 	public:
 	static void Init();
-	static void Cleanup();
+	static void Cleanup(bool throw_exception_if_not_initialised = true);
+	static void AssertInitialised();
 	static void Add   (Timer& rTimer);
 	static void Remove(Timer& rTimer);
 	static void RequestReschedule();