diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2020-02-25 08:16:16 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2020-02-25 18:26:46 +0300 |
| commit | 4f0fa41c49404871e361370baf1cf62029177b94 (patch) | |
| tree | c720beef9df5aac1e21df63c04d8602dfef75942 | |
| parent | 81909ca7f5e098682522d98d3c22018fa9bf76c1 (diff) | |
[qmake] Enable API tests for WebKitWidgets in Coin
[*] Add CONFIG += testcase to tests.pri
[*] Remove obsolete code from tests.pri
[*] Temporary disable assertion which fails in debug build
Change-Id: Ibe5acb7a0f2402eafde0034ca893b70f4c5a6bf9
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| -rw-r--r-- | Source/WebCore/platform/network/CacheValidation.cpp | 3 | ||||
| -rw-r--r-- | tests/webkitwidgets/qwebpage/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/webkitwidgets/tests.pri | 13 |
3 files changed, 6 insertions, 12 deletions
diff --git a/Source/WebCore/platform/network/CacheValidation.cpp b/Source/WebCore/platform/network/CacheValidation.cpp index f99c6b128..3a5b377c6 100644 --- a/Source/WebCore/platform/network/CacheValidation.cpp +++ b/Source/WebCore/platform/network/CacheValidation.cpp @@ -107,7 +107,8 @@ std::chrono::microseconds computeCurrentAge(const ResourceResponse& response, st std::chrono::microseconds computeFreshnessLifetimeForHTTPFamily(const ResourceResponse& response, std::chrono::system_clock::time_point responseTime) { using namespace std::chrono; - ASSERT(response.url().protocolIsInHTTPFamily()); + // QTFIXME: Restore assert when tst_QWebFrame::requestedUrl is fixed + // ASSERT(response.url().protocolIsInHTTPFamily()); // Freshness Lifetime: // http://tools.ietf.org/html/rfc7234#section-4.2.1 diff --git a/tests/webkitwidgets/qwebpage/BLACKLIST b/tests/webkitwidgets/qwebpage/BLACKLIST new file mode 100644 index 000000000..cbe0821c7 --- /dev/null +++ b/tests/webkitwidgets/qwebpage/BLACKLIST @@ -0,0 +1,2 @@ +[cursorMovements] +windows diff --git a/tests/webkitwidgets/tests.pri b/tests/webkitwidgets/tests.pri index b48806286..adad70142 100644 --- a/tests/webkitwidgets/tests.pri +++ b/tests/webkitwidgets/tests.pri @@ -1,20 +1,11 @@ TEMPLATE = app +CONFIG += testcase VPATH += $$_PRO_FILE_PWD_ TARGET = tst_$$TARGET -# Load mobilityconfig if Qt Mobility is available -load(mobilityconfig, true) -contains(MOBILITY_CONFIG, multimedia) { - # This define is used by tests depending on Qt Multimedia - DEFINES -= WTF_USE_QT_MULTIMEDIA=0 - DEFINES += WTF_USE_QT_MULTIMEDIA=1 -} - SOURCES += $${TARGET}.cpp -INCLUDEPATH += \ - $$PWD \ - $$PWD/../Api +INCLUDEPATH += $$PWD QT += testlib network webkitwidgets widgets |