From d26a71da187cf908446d2c8af92892692a7c2db3 Mon Sep 17 00:00:00 2001 From: Toby Tomkins Date: Thu, 12 Jan 2012 14:59:14 +1000 Subject: Flag test as expected failure for Ubuntu 11.10 x64. Change-Id: I05ff434581f48d4d3ede7ecb59208821a2ab3e7d Reviewed-by: Rohan McGovern --- tests/auto/network/socket/qtcpsocket/qtcpsocket.pro | 1 + tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 3 +++ 2 files changed, 4 insertions(+) (limited to 'tests') 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"); } -- cgit v1.2.3