diff options
Diffstat (limited to 'WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp')
-rw-r--r-- | WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp index 00ccdb5..4e6f049 100644 --- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp +++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp @@ -567,6 +567,13 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting() setlocale(LC_ALL, ""); } +static bool isGlobalHistoryTest(const QUrl& url) +{ + if (url.path().contains("globalhistory/")) + return true; + return false; +} + static bool isWebInspectorTest(const QUrl& url) { if (url.path().contains("inspector/")) @@ -595,6 +602,9 @@ void DumpRenderTree::open(const QUrl& url) layoutTestController()->showWebInspector(); } + if (isGlobalHistoryTest(url)) + layoutTestController()->dumpHistoryCallbacks(); + // W3C SVG tests expect to be 480x360 bool isW3CTest = url.toString().contains("svg/W3C-SVG-1.1"); int width = isW3CTest ? 480 : LayoutTestController::maxViewWidth; @@ -668,8 +678,10 @@ void DumpRenderTree::processArgsLine(const QStringList &args) void DumpRenderTree::loadNextTestInStandAloneMode() { - if (m_standAloneModeTestList.isEmpty()) + if (m_standAloneModeTestList.isEmpty()) { emit quit(); + return; + } processLine(m_standAloneModeTestList.first()); m_standAloneModeTestList.removeFirst(); |