Merge remote-tracking branch 'gerrit/master' into containers

Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c

5 files changed, 10 insertions, 21 deletions

diff --git a/tests/auto/network/socket/qlocalsocket/example/client/client.pro b/tests/auto/network/socket/qlocalsocket/example/client/client.pro
index 84f20d6ec0..4b6585ff10 100644
--- a/tests/auto/network/socket/qlocalsocket/example/client/client.pro
+++ b/tests/auto/network/socket/qlocalsocket/example/client/client.pro
@@ -1,10 +1,4 @@
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
 CONFIG += console
 QT = core network
 
 SOURCES += main.cpp
-
-
diff --git a/tests/auto/network/socket/qlocalsocket/example/server/server.pro b/tests/auto/network/socket/qlocalsocket/example/server/server.pro
index bfd14d2bb7..b78e63d0a7 100644
--- a/tests/auto/network/socket/qlocalsocket/example/server/server.pro
+++ b/tests/auto/network/socket/qlocalsocket/example/server/server.pro
@@ -1,13 +1,5 @@
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
 CONFIG += console
 
 QT = core network
 
-# Input
 SOURCES += main.cpp
-
-
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 72fa9f74a4..2715bfc5dc 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -50,6 +50,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h> // for unlink()
 #endif
 
 Q_DECLARE_METATYPE(QLocalSocket::LocalSocketError)
@@ -1129,7 +1130,7 @@ void tst_QLocalSocket::verifyListenWithDescriptor()
     } else if (abstract) {
         QVERIFY2(server.fullServerName().at(0) == QLatin1Char('@'), "abstract sockets should start with a '@'");
     } else {
-        QVERIFY2(server.fullServerName() == path, "full server path doesn't match patch provided");
+        QCOMPARE(server.fullServerName(), path);
         if (path.contains(QLatin1String("/"))) {
             QVERIFY2(server.serverName() == path.mid(path.lastIndexOf(QLatin1Char('/'))+1), "server name invalid short name");
         } else {
@@ -1153,8 +1154,10 @@ void tst_QLocalSocket::verifyListenWithDescriptor_data()
     QTest::addColumn<bool>("bound");
 
     QTest::newRow("normal") << QDir::tempPath() + QLatin1Literal("/testsocket") << false << true;
+#ifdef Q_OS_LINUX
     QTest::newRow("absrtact") << QString::fromLatin1("abstractsocketname") << true << true;
     QTest::newRow("abstractwithslash") << QString::fromLatin1("abstractsocketwitha/inthename") << true << true;
+#endif
     QTest::newRow("no path") << QString::fromLatin1("/invalid/no path name speficied") << true << false;
 
 #endif
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index abeb1ed06d..2c2b551257 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -68,7 +68,7 @@
 #include <QStringList>
 #include <QTcpServer>
 #include <QTcpSocket>
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 #include <QSslSocket>
 #endif
 #include <QTextStream>
@@ -332,7 +332,7 @@ void tst_QTcpSocket::initTestCase_data()
     QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic) << false;
 //    QTest::newRow("WithHttpProxyNtlmAuth") << true << int(HttpProxy | AuthNtlm) << false;
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     QTest::newRow("WithoutProxy SSL") << false << 0 << true;
     QTest::newRow("WithSocks5Proxy SSL") << true << int(Socks5Proxy) << true;
     QTest::newRow("WithSocks5AuthProxy SSL") << true << int(Socks5Proxy | AuthBasic) << true;
@@ -392,7 +392,7 @@ void tst_QTcpSocket::init()
 QTcpSocket *tst_QTcpSocket::newSocket() const
 {
     QTcpSocket *socket;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     QFETCH_GLOBAL(bool, ssl);
     socket = ssl ? new QSslSocket : new QTcpSocket;
 #else
@@ -1640,7 +1640,7 @@ public:
 protected:
     inline void run()
     {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         QFETCH_GLOBAL(bool, ssl);
         if (ssl)
             socket = new QSslSocket;
@@ -1924,7 +1924,7 @@ public:
         attemptedToConnect = false;
         networkTimeout = false;
         count = 0;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
         QFETCH_GLOBAL(bool, ssl);
         if (ssl)
             sock = new QSslSocket;
diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro
index 426dca2277..6d86eab209 100644
--- a/tests/auto/network/socket/socket.pro
+++ b/tests/auto/network/socket/socket.pro
@@ -3,7 +3,7 @@ SUBDIRS=\
    qhttpsocketengine \
    qudpsocket \
    qtcpsocket \
-   #qlocalsocket \  # FIXME: uses qtscript (QTBUG-19242)
+   qlocalsocket \
    qtcpserver \
    qsocks5socketengine \
    qabstractsocket \