diff options
Diffstat (limited to 'tests/auto/network/socket')
| -rw-r--r-- | tests/auto/network/socket/.prev_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/network/socket/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/network/socket/qlocalsocket/BLACKLIST | 7 | ||||
| -rw-r--r-- | tests/auto/network/socket/socket.pro | 6 |
4 files changed, 23 insertions, 4 deletions
diff --git a/tests/auto/network/socket/.prev_CMakeLists.txt b/tests/auto/network/socket/.prev_CMakeLists.txt index 7e72b4be29..7e822d23ab 100644 --- a/tests/auto/network/socket/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/.prev_CMakeLists.txt @@ -7,9 +7,11 @@ if(QT_FEATURE_private_tests) add_subdirectory(platformsocketengine) endif() add_subdirectory(qudpsocket) -add_subdirectory(qlocalsocket) -add_subdirectory(qtcpserver) add_subdirectory(qabstractsocket) +if(NOT ANDROID) + add_subdirectory(qlocalsocket) + add_subdirectory(qtcpserver) +endif() if(QT_FEATURE_sctp) add_subdirectory(qsctpsocket) endif() diff --git a/tests/auto/network/socket/CMakeLists.txt b/tests/auto/network/socket/CMakeLists.txt index 7e72b4be29..6e4421aad8 100644 --- a/tests/auto/network/socket/CMakeLists.txt +++ b/tests/auto/network/socket/CMakeLists.txt @@ -7,9 +7,13 @@ if(QT_FEATURE_private_tests) add_subdirectory(platformsocketengine) endif() add_subdirectory(qudpsocket) -add_subdirectory(qlocalsocket) -add_subdirectory(qtcpserver) add_subdirectory(qabstractsocket) +if(NOT ANDROID) + # QTBUG-87387 # special case + add_subdirectory(qlocalsocket) + # QTBUG-87388 # special case + add_subdirectory(qtcpserver) +endif() if(QT_FEATURE_sctp) add_subdirectory(qsctpsocket) endif() diff --git a/tests/auto/network/socket/qlocalsocket/BLACKLIST b/tests/auto/network/socket/qlocalsocket/BLACKLIST new file mode 100644 index 0000000000..cec50425c5 --- /dev/null +++ b/tests/auto/network/socket/qlocalsocket/BLACKLIST @@ -0,0 +1,7 @@ +# QTBUG-87387 +[fullPath] +android +[processConnection] +android +[verifySocketOptions] +android diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro index 1248d71172..e71c6884cd 100644 --- a/tests/auto/network/socket/socket.pro +++ b/tests/auto/network/socket/socket.pro @@ -12,6 +12,12 @@ SUBDIRS=\ platformsocketengine \ qsctpsocket \ +android: SUBDIRS -= \ + # QTBUG-87387 + qlocalsocket \ + # QTBUG-87388 + qtcpserver + !qtConfig(private_tests): SUBDIRS -= \ platformsocketengine \ qtcpsocket \ |