Title: [134780] trunk/Tools
- Revision
- 134780
- Author
- [email protected]
- Date
- 2012-11-15 08:50:57 -0800 (Thu, 15 Nov 2012)
Log Message
[Mac] Implement WTR --no-timeout-at-all option
https://bugs.webkit.org/show_bug.cgi?id=102251
Reviewed by Eric Carlson.
* WebKitTestRunner/mac/TestControllerMac.mm: (WTR::TestController::platformRunUntil):
Just do it, and convert to Objective C on the way for simplicity.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (134779 => 134780)
--- trunk/Tools/ChangeLog 2012-11-15 16:35:30 UTC (rev 134779)
+++ trunk/Tools/ChangeLog 2012-11-15 16:50:57 UTC (rev 134780)
@@ -1,3 +1,13 @@
+2012-11-15 Alexey Proskuryakov <[email protected]>
+
+ [Mac] Implement WTR --no-timeout-at-all option
+ https://bugs.webkit.org/show_bug.cgi?id=102251
+
+ Reviewed by Eric Carlson.
+
+ * WebKitTestRunner/mac/TestControllerMac.mm: (WTR::TestController::platformRunUntil):
+ Just do it, and convert to Objective C on the way for simplicity.
+
2012-11-14 Ryuan Choi <[email protected]>
[EFL] Port tiled backing store
Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (134779 => 134780)
--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2012-11-15 16:35:30 UTC (rev 134779)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2012-11-15 16:50:57 UTC (rev 134780)
@@ -53,12 +53,10 @@
void TestController::platformRunUntil(bool& done, double timeout)
{
- // FIXME: No timeout should occur if timeout is equal to m_noTimeout (necessary when running performance tests).
- CFAbsoluteTime end = CFAbsoluteTimeGetCurrent() + timeout;
- CFDateRef endDate = CFDateCreate(0, end);
- while (!done && CFAbsoluteTimeGetCurrent() < end)
- [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:(NSDate *)endDate];
- CFRelease(endDate);
+ NSDate *endDate = (timeout > 0) ? [NSDate dateWithTimeIntervalSinceNow:timeout] : [NSDate distantFuture];
+
+ while (!done && [endDate compare:[NSDate date]] == NSOrderedDescending)
+ [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:endDate];
}
void TestController::platformInitializeContext()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
