qt 6.5.1 original

tests/auto/tools/macdeployqt/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_macdeployqt Test:
+#####################################################################
+
+qt_internal_add_test(tst_macdeployqt
+    SOURCES
+        tst_macdeployqt.cpp
+)

tests/auto/tools/macdeployqt/source_basicapp/basicapp.pro

@@ -0,0 +1 @@
+SOURCES = main.cpp

tests/auto/tools/macdeployqt/source_basicapp/main.cpp

@@ -0,0 +1,19 @@
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <QGuiApplication>
+#include <QRasterWindow>
+#include <QScreen>
+#include <QTimer>
+
+// Simple test application just to verify that it comes up properly
+
+int main(int argc, char ** argv)
+{
+   QGuiApplication app(argc, argv);
+   QRasterWindow w;
+   w.setTitle("macdeployqt test application");
+   w.show();
+   QTimer::singleShot(200, &w, &QCoreApplication::quit);
+   return app.exec();
+}

tests/auto/tools/macdeployqt/source_plugin_sqlite/main.cpp

@@ -0,0 +1,11 @@
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <QtSql>
+
+int main(int argc, char ** argv)
+{
+   QCoreApplication app(argc, argv);
+   QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
+   return db.isValid() ? 0 : 1;
+}

tests/auto/tools/macdeployqt/source_plugin_sqlite/plugin_sqlite.pro

@@ -0,0 +1,2 @@
+SOURCES = main.cpp
+QT += sql

tests/auto/tools/macdeployqt/source_plugin_tls/main.cpp

@@ -0,0 +1,10 @@
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <QtNetwork>
+
+int main(int argc, char ** argv)
+{
+   QCoreApplication app(argc, argv);
+   return QSslSocket::supportsSsl() ? 0 : 1;
+}

tests/auto/tools/macdeployqt/source_plugin_tls/plugin_tls.pro

@@ -0,0 +1,2 @@
+SOURCES = main.cpp
+QT += network

tests/auto/tools/macdeployqt/tst_macdeployqt.cpp

@@ -0,0 +1,291 @@
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <QtCore>
+#include <QtTest>
+
+bool g_testDirectoryBuild = false; // toggle to keep build output for debugging.
+QTemporaryDir *g_temporaryDirectory;
+QString g_macdeployqtBinary;
+QString g_qmakeBinary;
+QString g_makeBinary;
+QString g_installNameToolBinary;
+
+#if QT_CONFIG(process)
+
+static const QString msgProcessError(const QProcess &process, const QString &what)
+{
+    QString result;
+    QTextStream(&result) << what << ": \"" << process.program() << ' '
+        << process.arguments().join(QLatin1Char(' ')) << "\": " << process.errorString();
+    return result;
+}
+
+static bool runProcess(const QString &binary,
+                       const QStringList &arguments,
+                       QString *errorMessage,
+                       const QString &workingDir = QString(),
+                       const QProcessEnvironment &env = QProcessEnvironment(),
+                       int timeOut = 10000,
+                       QByteArray *stdOut = nullptr, QByteArray *stdErr = nullptr)
+{
+    QProcess process;
+    if (!env.isEmpty())
+        process.setProcessEnvironment(env);
+    if (!workingDir.isEmpty())
+        process.setWorkingDirectory(workingDir);
+    process.start(binary, arguments, QIODevice::ReadOnly);
+    if (!process.waitForStarted()) {
+        *errorMessage = msgProcessError(process, "Failed to start");
+        return false;
+    }
+    if (!process.waitForFinished(timeOut)) {
+        *errorMessage = msgProcessError(process, "Timed out");
+        process.terminate();
+        if (!process.waitForFinished(300))
+            process.kill();
+        return false;
+    }
+    if (stdOut)
+        *stdOut = process.readAllStandardOutput();
+    if (stdErr)
+        *stdErr= process.readAllStandardError();
+    if (process.exitStatus() != QProcess::NormalExit) {
+        *errorMessage = msgProcessError(process, "Crashed");
+        return false;
+    }
+    if (process.exitCode() != QProcess::NormalExit) {
+        *errorMessage = msgProcessError(process, "Exit code " + QString::number(process.exitCode()));
+        return false;
+    }
+    return true;
+}
+
+#else
+
+static bool runProcess(const QString &binary,
+                       const QStringList &arguments,
+                       QString *arguments,
+                       const QString &workingDir = QString(),
+                       const QProcessEnvironment &env = QProcessEnvironment(),
+                       int timeOut = 5000,
+                       QByteArray *stdOut = Q_NULLPTR, QByteArray *stdErr = Q_NULLPTR)
+{
+    Q_UNUSED(binary);
+    Q_UNUSED(arguments);
+    Q_UNUSED(arguments);
+    Q_UNUSED(workingDir);
+    Q_UNUSED(env);
+    Q_UNUSED(timeOut);
+    Q_UNUSED(stdOut);
+    Q_UNUSED(stdErr);
+    return false;
+}
+
+#endif
+
+QString sourcePath(const QString &name)
+{
+    return "source_" + name;
+}
+
+QString buildPath(const QString &name)
+{
+    if (g_testDirectoryBuild)
+        return "build_" + name;
+    return g_temporaryDirectory->path() + "/build_" + name;
+}
+
+bool qmake(const QString &source, const QString &destination, QString *errorMessage)
+{
+    QStringList args = QStringList() << source;
+    return runProcess(g_qmakeBinary, args, errorMessage, destination);
+}
+
+bool make(const QString &destination, QString *errorMessage)
+{
+    QStringList args;
+    return runProcess(g_makeBinary, args, errorMessage, destination,
+                      {}, 60000);
+}
+
+void build(const QString &name)
+{
+    // Build the app or framework according to the convention used
+    // by this test:
+    //   source_name (source code)
+    //   build_name  (build artifacts)
+
+    QString source = sourcePath(name);
+    QString build = buildPath(name);
+    QString profile = name + ".pro";
+
+    QString sourcePath = QFINDTESTDATA(source);
+    QVERIFY(!sourcePath.isEmpty());
+
+    // Clear/set up build dir
+    QString buildPath = build;
+    QVERIFY(QDir(buildPath).removeRecursively());
+    QVERIFY(QDir().mkdir(buildPath));
+    QVERIFY(QDir(buildPath).exists());
+
+    // Build application
+    QString sourceProFile = QDir(sourcePath).canonicalPath() + '/' + profile;
+    QString errorMessage;
+    QVERIFY2(qmake(sourceProFile, buildPath, &errorMessage), qPrintable(errorMessage));
+    QVERIFY2(make(buildPath, &errorMessage), qPrintable(errorMessage));
+}
+
+bool changeInstallName(const QString &path, const QString &binary, const QString &from, const QString &to)
+{
+    QStringList args = QStringList() << binary << "-change" << from << to;
+    QString errorMessage;
+    return runProcess(g_installNameToolBinary, args, &errorMessage, path);
+}
+
+bool deploy(const QString &name, const QStringList &options, QString *errorMessage)
+{
+    QString bundle = name + ".app";
+    QString path = buildPath(name);
+    QStringList args = QStringList() << bundle << options;
+    return runProcess(g_macdeployqtBinary, args, errorMessage, path);
+}
+
+bool debugDeploy(const QString &name, const QStringList &options, QString *errorMessage)
+{
+    QString bundle = name + ".app";
+    QString path = buildPath(name);
+    QStringList args = QStringList() << bundle << options << "-verbose=3";
+    QByteArray stdOut;
+    QByteArray stdErr;
+    bool exitOK = runProcess(g_macdeployqtBinary, args, errorMessage, path, QProcessEnvironment(),
+                              10000, &stdOut, &stdErr);
+
+    qDebug() << "macdeployqt exit OK" << exitOK;
+    qDebug() << qPrintable(stdOut);
+    qDebug() << qPrintable(stdErr);
+
+    return exitOK;
+}
+
+bool run(const QString &name, QString *errorMessage)
+{
+    QString path = buildPath(name);
+    QStringList args;
+    QString binary = name + ".app/Contents/MacOS/" + name;
+    return runProcess(binary, args, errorMessage, path);
+}
+
+bool runPrintLibraries(const QString &name, QString *errorMessage, QByteArray *stdErr)
+{
+    QString binary = name + ".app/Contents/MacOS/" + name;
+    QString path = buildPath(name);
+    QStringList args;
+    QProcessEnvironment env = QProcessEnvironment();
+    env.insert("DYLD_PRINT_LIBRARIES", "true");
+    QByteArray stdOut;
+    return runProcess(binary, args, errorMessage, path, env, 5000, &stdOut, stdErr);
+}
+
+void runVerifyDeployment(const QString &name)
+{
+    QString errorMessage;
+    // Verify that the application runs after deployment and that it loads binaries from
+    // the application bundle only.
+    QByteArray libraries;
+    QVERIFY2(runPrintLibraries(name, &errorMessage, &libraries), qPrintable(errorMessage));
+    const QList<QString> parts = QString::fromLocal8Bit(libraries).split("dyld: loaded:");
+    const QString qtPath = QLibraryInfo::path(QLibraryInfo::PrefixPath);
+    // Let assume Qt is not installed in system
+    foreach (QString part, parts) {
+        part = part.trimmed();
+        if (part.isEmpty())
+            continue;
+        QVERIFY(!parts.startsWith(qtPath));
+    }
+}
+
+class tst_macdeployqt : public QObject
+{
+    Q_OBJECT
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void basicapp();
+    void plugins_data();
+    void plugins();
+};
+
+void tst_macdeployqt::initTestCase()
+{
+#ifdef QT_NO_PROCESS
+    QSKIP("This test requires QProcess support");
+#endif
+
+    // Set up test-global unique temporary directory
+    g_temporaryDirectory = new QTemporaryDir();
+    QVERIFY(g_temporaryDirectory->isValid());
+
+    // Locate build and deployment tools
+    g_macdeployqtBinary = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/macdeployqt";
+    QVERIFY(!g_macdeployqtBinary.isEmpty());
+    g_qmakeBinary = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmake";
+    QVERIFY(!g_qmakeBinary.isEmpty());
+    g_makeBinary = QStandardPaths::findExecutable("make");
+    QVERIFY(!g_makeBinary.isEmpty());
+    g_installNameToolBinary = QStandardPaths::findExecutable("install_name_tool");
+    QVERIFY(!g_installNameToolBinary.isEmpty());
+}
+
+void tst_macdeployqt::cleanupTestCase()
+{
+    delete g_temporaryDirectory;
+}
+
+// Verify that deployment of a basic Qt Gui application works
+void tst_macdeployqt::basicapp()
+{
+#ifdef QT_NO_PROCESS
+    QSKIP("This test requires QProcess support");
+#endif
+
+    QString errorMessage;
+    QString name = "basicapp";
+
+    // Build and verify that the application runs before deployment
+    build(name);
+    QVERIFY2(run(name, &errorMessage), qPrintable(errorMessage));
+
+    // Deploy application
+    QVERIFY2(deploy(name, QStringList(), &errorMessage), qPrintable(errorMessage));
+
+    // Verify deployment
+    runVerifyDeployment(name);
+}
+
+void tst_macdeployqt::plugins_data()
+{
+     QTest::addColumn<QString>("name");
+     QTest::newRow("sqlite") << "plugin_sqlite";
+     QTest::newRow("tls") << "plugin_tls";
+}
+
+void tst_macdeployqt::plugins()
+{
+    QFETCH(QString, name);
+
+    build(name);
+
+    // Verify that the test app runs before deployment.
+    QString errorMessage;
+    if (!run(name, &errorMessage)) {
+        qDebug() << qPrintable(errorMessage);
+        QSKIP("Could not run test application before deployment");
+    }
+
+    QVERIFY2(deploy(name, QStringList(), &errorMessage), qPrintable(errorMessage));
+    runVerifyDeployment(name);
+}
+
+QTEST_MAIN(tst_macdeployqt)
+#include "tst_macdeployqt.moc"