diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-20 14:09:00 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-21 08:39:41 +0200 |
commit | ea438b2508f329698e11c6dae6994d441c6e67df (patch) | |
tree | 7a6052b98ba1ff6e0258c52cfc2726e197f53dd2 /tests/auto/network/socket/qtcpsocket | |
parent | a2f319e9fb2f7595fc16d0d79e26438463051a53 (diff) | |
parent | 5f0ec7305e4310123ddeb98d3523087e3c560d9c (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/global/qsysinfo.h
src/corelib/kernel/qcoreapplication_win.cpp
src/gui/text/qdistancefield.cpp
src/gui/text/qdistancefield_p.h
src/plugins/platforms/windows/qwindowsglcontext.cpp
src/plugins/platforms/windows/qwindowsglcontext.h
Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
Diffstat (limited to 'tests/auto/network/socket/qtcpsocket')
-rw-r--r-- | tests/auto/network/socket/qtcpsocket/BLACKLIST | 13 | ||||
-rw-r--r-- | tests/auto/network/socket/qtcpsocket/test/test.pro | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/BLACKLIST b/tests/auto/network/socket/qtcpsocket/BLACKLIST new file mode 100644 index 0000000000..5fc2589323 --- /dev/null +++ b/tests/auto/network/socket/qtcpsocket/BLACKLIST @@ -0,0 +1,13 @@ +[bindThenResolveHost:first-fail] +windows +[bind:[::]] +windows +[bind:[::]:randomport] +windows +[invalidProxy:socks5-on-http] +windows +[disconnectWhileLookingUp] +windows +[timeoutConnect:ip] +windows +] diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro index 2dc1490256..337e75b372 100644 --- a/tests/auto/network/socket/qtcpsocket/test/test.pro +++ b/tests/auto/network/socket/qtcpsocket/test/test.pro @@ -15,5 +15,3 @@ win32 { } else { DESTDIR = ../ } - -win32: CONFIG += insignificant_test # Hangs in release builds |