Cope with macOS decomposed file names in the PackageManager auto test

Change-Id: I2da5b63c771e48c7b851a43f4acae7d14109537f
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

2 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
index 435ec5fc..1d5fe347 100644
--- a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
+++ b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
@@ -473,6 +473,9 @@ void tst_PackageManager::packageInstallation()
 #if defined(Q_OS_WIN)
             // files starting with . are not considered hidden on Windows
             files = files.filter(QRegularExpression(u"^[^.].*"_s));
+#elif defined(Q_OS_MACOS)
+            // starting with Qt7 file names will be reported as-is in macOS decomposed form
+            std::for_each(files.begin(), files.end(), [](QString &s) { s = s.normalized(QString::NormalizationForm_C); });
 #endif
             files.sort();
 
diff --git a/tests/auto/packageextractor/tst_packageextractor.cpp b/tests/auto/packageextractor/tst_packageextractor.cpp
index 81147f09..fdfe38c3 100644
--- a/tests/auto/packageextractor/tst_packageextractor.cpp
+++ b/tests/auto/packageextractor/tst_packageextractor.cpp
@@ -161,6 +161,10 @@ void tst_PackageExtractor::extractAndVerify()
     QDirIterator it(m_extractDir->path(), QDir::NoDotAndDotDot | QDir::AllEntries, QDirIterator::Subdirectories);
     while (it.hasNext()) {
         QString entry = it.next();
+#if defined(Q_OS_MACOS)
+        // starting with Qt7 file names will be reported as-is in macOS decomposed form
+        entry = entry.normalized(QString::NormalizationForm_C);
+#endif
         entry = entry.mid(m_extractDir->path().size() + 1);
 
         QVERIFY2(checkEntries.contains(entry), qPrintable(entry));