diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2020-09-22 14:30:04 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2020-09-24 16:58:02 +0300 |
commit | ac8ebc6c3a56064f88f5506e5e3783ab7bee2456 (patch) | |
tree | 47537790a381a6bf983edf9bb4093e4c575a16e0 | |
parent | 5a99e5d4c67bfa99c822746cbfbd80e398d23d97 (diff) |
Enable QML tests5.212
Change-Id: I10968ff39311aac6af328e5f13e316dbfc3c7a1e
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
-rw-r--r-- | Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp | 4 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/DesktopBehavior/DesktopBehavior.pro (renamed from tests/webkitqml/qmltests/DesktopBehavior.pro) | 10 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/BLACKLIST | 4 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/WebView/WebView.pro (renamed from tests/webkitqml/qmltests/WebView.pro) | 12 | ||||
-rw-r--r-- | tests/webkitqml/qmltests/qmltests.pro | 2 | ||||
-rw-r--r-- | tests/webkitqml/tests.pri | 8 | ||||
-rw-r--r-- | tests/webkitqml/webkitqml.pro | 2 |
7 files changed, 25 insertions, 17 deletions
diff --git a/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp b/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp index 3902003f9..7280c56d9 100644 --- a/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp +++ b/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp @@ -368,6 +368,10 @@ static ssize_t readBytesFromSocket(int socketDescriptor, Vector<uint8_t>& buffer void Connection::readyReadHandler() { #if PLATFORM(QT) + if (!m_socketNotifier) { + WTFLogAlways("Error receiving IPC message on socket %d in process %d: m_socketNotifier is null", m_socketDescriptor, getpid()); + return; + } SocketNotifierResourceGuard socketNotifierEnabler(m_socketNotifier); #endif diff --git a/tests/webkitqml/qmltests/DesktopBehavior.pro b/tests/webkitqml/qmltests/DesktopBehavior/DesktopBehavior.pro index e8ac901f1..4846d242d 100644 --- a/tests/webkitqml/qmltests/DesktopBehavior.pro +++ b/tests/webkitqml/qmltests/DesktopBehavior/DesktopBehavior.pro @@ -1,5 +1,5 @@ -include(../tests.pri) -SOURCES += tst_qmltests.cpp +include(../../tests.pri) +SOURCES += ../tst_qmltests.cpp TARGET = tst_qmltests_DesktopBehavior OBJECTS_DIR = .obj_DesktopBehavior @@ -10,9 +10,9 @@ QT += qmltest DEFINES += DISABLE_FLICKABLE_VIEWPORT=1 # Test the QML files under DesktopBehavior in the source repository. -DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}DesktopBehavior\\\"\" +DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\" DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\" OTHER_FILES += \ - DesktopBehavior/* \ - common/* + *.qml \ + ../common/* diff --git a/tests/webkitqml/qmltests/WebView/BLACKLIST b/tests/webkitqml/qmltests/WebView/BLACKLIST new file mode 100644 index 000000000..843ee3e7e --- /dev/null +++ b/tests/webkitqml/qmltests/WebView/BLACKLIST @@ -0,0 +1,4 @@ +[WebViewLoadFavIcon::test_favIconLoad] +ci * +[WebViewLoadFavIcon::test_favIconLoadEncodedUrl] +ci * diff --git a/tests/webkitqml/qmltests/WebView.pro b/tests/webkitqml/qmltests/WebView/WebView.pro index 6c67da96e..f468646b3 100644 --- a/tests/webkitqml/qmltests/WebView.pro +++ b/tests/webkitqml/qmltests/WebView/WebView.pro @@ -1,5 +1,5 @@ -include(../tests.pri) -SOURCES += tst_qmltests.cpp +include(../../tests.pri) +SOURCES += ../tst_qmltests.cpp TARGET = tst_qmltests_WebView OBJECTS_DIR = .obj_WebView @@ -9,11 +9,11 @@ CONFIG += testcase QT += qmltest # Test the QML files under WebView in the source repository. -DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}WebView\\\"\" +DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\" DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\" OTHER_FILES += \ - WebView/* \ - common/* + *.qml \ + ../common/* -RESOURCES = resources.qrc +RESOURCES = ../resources.qrc diff --git a/tests/webkitqml/qmltests/qmltests.pro b/tests/webkitqml/qmltests/qmltests.pro index 8ddc4484e..7f2847894 100644 --- a/tests/webkitqml/qmltests/qmltests.pro +++ b/tests/webkitqml/qmltests/qmltests.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += DesktopBehavior.pro WebView.pro +SUBDIRS += DesktopBehavior WebView diff --git a/tests/webkitqml/tests.pri b/tests/webkitqml/tests.pri index 0fb41b959..f5ec08535 100644 --- a/tests/webkitqml/tests.pri +++ b/tests/webkitqml/tests.pri @@ -4,16 +4,16 @@ VPATH += $$_PRO_FILE_PWD_ TARGET = tst_$$TARGET INCLUDEPATH += $$PWD -SOURCES += ../util.cpp +SOURCES += $$PWD/util.cpp QT += testlib webkit qtHaveModule(quick) { QT += qml quick quick-private - HEADERS += ../bytearraytestdata.h \ - ../util.h + HEADERS += $$PWD/bytearraytestdata.h \ + $$PWD/util.h - SOURCES += ../bytearraytestdata.cpp + SOURCES += $$PWD/bytearraytestdata.cpp } WEBKIT += wtf # For platform macros diff --git a/tests/webkitqml/webkitqml.pro b/tests/webkitqml/webkitqml.pro index 2af7ec801..248be9fb4 100644 --- a/tests/webkitqml/webkitqml.pro +++ b/tests/webkitqml/webkitqml.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -# SUBDIRS += qmltests +SUBDIRS += qmltests |