diff options
Diffstat (limited to 'Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp')
| -rw-r--r-- | Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp index b3ff3b9c1..b6f0aeee3 100644 --- a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp +++ b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp @@ -160,7 +160,9 @@ private slots: void testStopScheduledPageRefresh(); void findText(); void supportedContentType(); - void infiniteLoopJS(); + // [Qt] tst_QWebPage::infiniteLoopJS() timeouts with DFG JIT + // https://bugs.webkit.org/show_bug.cgi?id=79040 + // void infiniteLoopJS(); void navigatorCookieEnabled(); void deleteQWebViewTwice(); void renderOnRepaintRequestedShouldNotRecurse(); @@ -284,6 +286,9 @@ private: bool m_allowGeolocation; }; +// [Qt] tst_QWebPage::infiniteLoopJS() timeouts with DFG JIT +// https://bugs.webkit.org/show_bug.cgi?id=79040 +/* void tst_QWebPage::infiniteLoopJS() { JSTestPage* newPage = new JSTestPage(m_view); @@ -292,6 +297,7 @@ void tst_QWebPage::infiniteLoopJS() m_view->page()->mainFrame()->evaluateJavaScript("var run = true;var a = 1;while(run){a++;}"); delete newPage; } +*/ void tst_QWebPage::geolocationRequestJS() { @@ -299,7 +305,7 @@ void tst_QWebPage::geolocationRequestJS() if (newPage->mainFrame()->evaluateJavaScript(QLatin1String("!navigator.geolocation")).toBool()) { delete newPage; - QSKIP("Geolocation is not supported.", SkipSingle); + W_QSKIP("Geolocation is not supported.", SkipSingle); } connect(newPage, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), @@ -529,7 +535,7 @@ void tst_QWebPage::loadHtml5Video() QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65452", Continue); QCOMPARE(mUrl.toEncoded(), url); #else - QSKIP("This test requires Qt Multimedia", SkipAll); + W_QSKIP("This test requires Qt Multimedia", SkipAll); #endif } @@ -2738,7 +2744,7 @@ void tst_QWebPage::screenshot_data() void tst_QWebPage::screenshot() { if (!QDir(TESTS_SOURCE_DIR).exists()) - QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll); + W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll); QDir::setCurrent(TESTS_SOURCE_DIR); |