diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2012-01-12 14:59:14 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 06:25:25 +0100 |
| commit | d26a71da187cf908446d2c8af92892692a7c2db3 (patch) | |
| tree | 26ce8abc3ac04e15786c2e227c8fdf53cc19bdbc /tests/auto/network | |
| parent | 605329eb1b399753840256a4cd8e38d7658e7078 (diff) | |
Flag test as expected failure for Ubuntu 11.10 x64.
Change-Id: I05ff434581f48d4d3ede7ecb59208821a2ab3e7d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/network')
| -rw-r--r-- | tests/auto/network/socket/qtcpsocket/qtcpsocket.pro | 1 | ||||
| -rw-r--r-- | tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro index aa7ac6bbb7..a7b9f6126e 100644 --- a/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro +++ b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro @@ -4,5 +4,6 @@ TEMPLATE = subdirs !wince*: SUBDIRS = test stressTest wince*|vxworks* : SUBDIRS = test +linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 9fbc99eec0..c9c7054960 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -2259,6 +2259,9 @@ void tst_QTcpSocket::suddenRemoteDisconnect() QVERIFY(stopWatch.elapsed() < 20000); // Check that both exited normally. +#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__) + QEXPECT_FAIL("", "Fails on this platform", Abort); +#endif QCOMPARE(clientProcess.readAll().constData(), "SUCCESS\n"); QCOMPARE(serverProcess.readAll().constData(), "SUCCESS\n"); } |