diff options
Diffstat (limited to 'tests/auto/tools/macdeployqt/tst_macdeployqt.cpp')
-rw-r--r-- | tests/auto/tools/macdeployqt/tst_macdeployqt.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp b/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp index 40a142c96d..d408554319 100644 --- a/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp +++ b/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore> #include <QtTest> @@ -199,11 +199,11 @@ void runVerifyDeployment(const QString &name) 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()) + for (const QString &part : parts) { + const auto trimmed = part.trimmed(); + if (trimmed.isEmpty()) continue; - QVERIFY(!parts.startsWith(qtPath)); + QVERIFY(!trimmed.startsWith(qtPath)); } } @@ -224,6 +224,9 @@ void tst_macdeployqt::initTestCase() QSKIP("This test requires QProcess support"); #endif + if (QProcess::execute("xcode-select", { "-p" }) != 0) + QSKIP("Xcode or Xcode command line tools not installed"); + // Set up test-global unique temporary directory g_temporaryDirectory = new QTemporaryDir(); g_temporaryDirectory->setAutoRemove(!lcTests().isDebugEnabled()); |