summaryrefslogtreecommitdiffstats
path: root/tests/auto/network
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2022-02-15 17:00:10 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2022-03-14 20:16:35 +0100
commit479c95729a986fb9a6a25cdf763898cb865b61c7 (patch)
treeeba45187e69fb6908050cf78b7399cda73aeb20e /tests/auto/network
parentf081b2cb37e94fbf2e81013aa61da593fcba81c9 (diff)
Support global data tags in blacklisting identification of test-cases
Previously the blacklisting file format only worked with slot:data or plain slot names for the items to blacklist. However, tests with global data report themselves with the global data-row tag in the same way as function-specific ones do; and tests which have both join the two as slot(global:data) in the test output name, so the reader is apt to mistake global:data for a data tag. In any case, it is potentially desirable to be able to blacklist a function with either or both of global and local data-row tags specified. Add support for that and remove a blacklisting that was only needed due to the lack of this support. For now, make the new parameter to checkBlackLists() optional, so that qtdeclarative's qmltest framework can adapt to this change. Fixes: QTBUG-100870 Change-Id: I9125811ebdab75d3fb462ba8b60561f003426502 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/network')
-rw-r--r--tests/auto/network/socket/qtcpsocket/BLACKLIST2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/BLACKLIST b/tests/auto/network/socket/qtcpsocket/BLACKLIST
index d42457d743..1791156ee5 100644
--- a/tests/auto/network/socket/qtcpsocket/BLACKLIST
+++ b/tests/auto/network/socket/qtcpsocket/BLACKLIST
@@ -1,7 +1,5 @@
[timeoutConnect:ip]
windows
-[connectToHostError]
-windows-10 gcc developer-build
# QTBUG-66247
[delayedClose:WithSocks5Proxy]
windows-10 gcc developer-build