From 6dba08aead892c56014237051d8de66e18c4a63c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 May 2014 15:13:16 +0000 Subject: [PATCH] Disable another wxStopWatch test case in the build bot builds. We can't rely on the program waking up quickly enough when running on the (loaded) buildbot machines, better to skip this test than to have spurious failures. This is a backport of 5de9b53902fdc1dd3f72a3233c2db9cba3178025 from trunk. --- tests/events/stopwatch.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/events/stopwatch.cpp b/tests/events/stopwatch.cpp index 1650484039..fb50b70ed8 100644 --- a/tests/events/stopwatch.cpp +++ b/tests/events/stopwatch.cpp @@ -145,7 +145,19 @@ void StopWatchTestCase::RestartBug() WX_ASSERT_MESSAGE ( ("Actual time value is %ld", t), - t > offset + sleepTime - tolerance && - t < offset + sleepTime + tolerance + t >= offset + sleepTime ); + + // As above, this is not actually due to the fact of the test being + // automatic but just because buildot machines are usually pretty slow, so + // this test often fails there simply because of the high load on them. + if ( !IsAutomaticTest() ) + { + + WX_ASSERT_MESSAGE + ( + ("Actual time value is %ld", t), + t < offset + sleepTime + tolerance + ); + } }