diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-10-15 13:01:07 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-10-16 09:08:22 +0300 |
| commit | 1e60013b8bf7125b8bcaed037a59001f856bb951 (patch) | |
| tree | 00e27173e1646a23edb33564cf9457ab40b1256d | |
| parent | 89cfd098cdf601626e56fda372a76924611ae355 (diff) | |
Fix packagemanagercore test in macos
Change-Id: I67178a9df34e3ed4752452dca9a85709fdd4c620
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| -rw-r--r-- | tests/auto/installer/packagemanagercore/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/installer/packagemanagercore/BLACKLIST b/tests/auto/installer/packagemanagercore/BLACKLIST deleted file mode 100644 index 3ba5ffe5d..000000000 --- a/tests/auto/installer/packagemanagercore/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[testDisallowRunningProcess] -macos diff --git a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp index dafcd2676..c7cf1028f 100644 --- a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp +++ b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp @@ -290,6 +290,9 @@ private slots: void testAllowRunningProcess() { + #ifdef Q_OS_MACOS + QSKIP("In macOS the app path and maintenancetool differ, not possible to test running processes."); + #endif PackageManagerCore core; core.setPackageManager(); const QString testDirectory = QInstaller::generateTemporaryFileName(); @@ -309,6 +312,9 @@ private slots: void testDisallowRunningProcess() { + #ifdef Q_OS_MACOS + QSKIP("In macOS the app path and maintenancetool differ, not possible to test running processes."); + #endif PackageManagerCore core; core.setPackageManager(); const QString testDirectory = QInstaller::generateTemporaryFileName(); |