summaryrefslogtreecommitdiffstats
path: root/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp')
-rw-r--r--WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp b/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
index d3aee4a..d4de1ba 100644
--- a/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
+++ b/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
@@ -83,8 +83,9 @@ void TestController::platformInitialize()
{
}
-void TestController::runUntil(bool& done)
+void TestController::platformRunUntil(bool& done, double)
{
+ // FIXME: Honor the timeout parameter <http://webkit.org/b/48941>.
RunUntilConditionLoop::start(done);
ASSERT(done);
}
@@ -93,7 +94,7 @@ static bool isExistingLibrary(const QString& path)
{
#if OS(WINDOWS) || OS(SYMBIAN)
const char* librarySuffixes[] = { ".dll" };
-#elif PLATFORM(MAC)
+#elif OS(MAC_OS_X)
const char* librarySuffixes[] = { ".bundle", ".dylib", ".so" };
#elif OS(UNIX)
const char* librarySuffixes[] = { ".so" };