diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-06-13 16:35:40 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-11-26 07:06:59 +0000 |
| commit | 71bd06d516a2410ae0ea698e79dcb94aba9bc5b4 (patch) | |
| tree | 75ca3d56d9a02711bf20325a1507b157d5eb79c7 /tests/auto/network/socket | |
| parent | d8b401959f6f58bc80f767684b250dd4589735d6 (diff) | |
Make developer build tests pass for boot2qt
Some tests were fixed and others were skipped/blacklisted.
Task-number: QTBUG-63152
Change-Id: Ica7df555f8d152ee589865911130525101d4b941
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'tests/auto/network/socket')
| -rw-r--r-- | tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 263a475435..c473230246 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -2429,7 +2429,17 @@ void tst_QTcpSocket::suddenRemoteDisconnect() QString::fromLatin1("Could not start %1: %2").arg(processExe, serverProcess.errorString()))); while (!serverProcess.canReadLine()) QVERIFY(serverProcess.waitForReadyRead(10000)); - QCOMPARE(serverProcess.readLine().data(), QByteArray(server.toLatin1() + "\n").data()); + + QByteArray line = serverProcess.readLine(); + + // Ignore following print, happens on Qemu: + if (line == "getsockopt level=41 optname=26 not yet supported\n") { + while (!serverProcess.canReadLine()) + QVERIFY(serverProcess.waitForReadyRead(10000)); + line = serverProcess.readLine(); + } + + QCOMPARE(line.data(), QByteArray(server.toLatin1() + "\n").data()); // Start client QProcess clientProcess; |