diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qftp/qftp.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qftp/tst_qftp.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/qftp/qftp.pro index 42c700e72e..69f89572ba 100644 --- a/tests/auto/qftp/qftp.pro +++ b/tests/auto/qftp/qftp.pro @@ -18,5 +18,3 @@ wince*: { } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } - -CONFIG+=insignificant_test diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp index 62b454099b..e31b5acda3 100644 --- a/tests/auto/qftp/tst_qftp.cpp +++ b/tests/auto/qftp/tst_qftp.cpp @@ -378,6 +378,8 @@ void tst_QFtp::connectToUnresponsiveHost() a lot of other stuff in QFtp, so we just expect this test to fail on Windows. */ QEXPECT_FAIL("", "timeout not working due to strange Windows socket behaviour (see source file of this test for explanation)", Abort); +#else + QEXPECT_FAIL("", "QTBUG-20687", Abort); #endif QVERIFY2(! QTestEventLoop::instance().timeout(), "Network timeout longer than expected (should have been 60 seconds)"); |