summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-10-13 14:36:18 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2020-11-04 12:27:49 +0200
commit039d3fe4e884c3680cb21d89deba7857dde1269c (patch)
tree6dac25efb404be03393fa77179086d4850eaee5b /tests/auto/network/socket
parenta7b6f0391b437e4b1a1d834421edfa78ff2ec14c (diff)
Android: blacklist a list of failing tests for android
We want to re-enable Android tests in QTQAINFRA-3867. However, many tests are failing already preventing that from happening. QTBUG-87025 is currently keeping track (links) to all of those failing tests. The current proposal is to hide those failing tests, and enable Android test running in COIN for other tests. After, that try to fix them one by one, and at the same time we can make sure no more failing tests go unnoticed. Task-number: QTBUG-87025 Change-Id: Ic1fe9fdd167cbcfd99efce9a09c69c344a36bbe4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/network/socket')
-rw-r--r--tests/auto/network/socket/.prev_CMakeLists.txt6
-rw-r--r--tests/auto/network/socket/CMakeLists.txt8
-rw-r--r--tests/auto/network/socket/qlocalsocket/BLACKLIST7
-rw-r--r--tests/auto/network/socket/socket.pro6
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 \