Fix qlocalsocket autotest

Lackey is currently not built due to a qscript dependency. Mark the
test as an expected failure, so we can resume testing QLocalSocket
again. See QTBUG-24142

Change-Id: I2642ed30cf7a2068f30f63801c632fea7dae7691
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>

1 files changed, 11 insertions, 19 deletions

diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 221ef602a1..5d3cb6eaae 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -53,10 +53,6 @@ class tst_QLocalSocket : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QLocalSocket();
-    virtual ~tst_QLocalSocket();
-
 public Q_SLOTS:
     void init();
     void cleanup();
@@ -110,20 +106,6 @@ private slots:
     void asyncDisconnectNotify();
 };
 
-tst_QLocalSocket::tst_QLocalSocket()
-{
-    if (!QFile::exists("lackey/lackey"
-#ifdef Q_OS_WIN
-    ".exe"
-#endif
-                ))
-        qWarning() << "lackey executable doesn't exists!";
-}
-
-tst_QLocalSocket::~tst_QLocalSocket()
-{
-}
-
 void tst_QLocalSocket::init()
 {
     qRegisterMetaType<QLocalSocket::LocalSocketState>("QLocalSocket::LocalSocketState");
@@ -749,6 +731,16 @@ void tst_QLocalSocket::processConnection_data()
  */
 void tst_QLocalSocket::processConnection()
 {
+#ifdef Q_OS_WIN
+#  define EXE_SUFFIX ".exe"
+#else
+#  define EXE_SUFFIX
+#endif
+
+// ### lackey is currently not build
+    QEXPECT_FAIL("", "lackey is currently not built due to qscript dependency, QTBUG-24142", Abort);
+    QVERIFY(QFile::exists("lackey/lackey" EXE_SUFFIX));
+
     QFETCH(int, processes);
     QStringList serverArguments = QStringList() << SRCDIR "lackey/scripts/server.js" << QString::number(processes);
     QProcess producer;
@@ -758,7 +750,7 @@ void tst_QLocalSocket::processConnection()
 #endif
     QList<QProcess*> consumers;
     producer.start("lackey/lackey", serverArguments);
-    QVERIFY(producer.waitForStarted(-1));
+    QVERIFY2(producer.waitForStarted(-1), qPrintable(producer.errorString()));
     QTest::qWait(2000);
     for (int i = 0; i < processes; ++i) {
        QStringList arguments = QStringList() << SRCDIR "lackey/scripts/client.js";