summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMarcus Tillmanns <marcus.tillmanns@qt.io>2022-06-28 11:17:24 +0200
committerMarcus Tillmanns <marcus.tillmanns@qt.io>2022-06-28 11:31:11 +0000
commit88651ecb3e0b6e186be22399c69b5edf0c9fe118 (patch)
treea0a8ba5be2aab3917f97ff0e55180702623afd83 /tests
parent0c2e1cf0946376e4e433505a99177647430010e7 (diff)
downloadqt-creator-88651ecb3e0b6e186be22399c69b5edf0c9fe118.tar.gz
deviceshell: Disable tests on old macos versions
The bundled "base64" tool of macos < 10.15 did not support the "-d" option ( only -D ). We disable the tests running on the local shell to keep them from failing. Change-Id: I6af353869033ed15cefedc03e2562621d1ea9904 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/utils/deviceshell/tst_deviceshell.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/utils/deviceshell/tst_deviceshell.cpp b/tests/auto/utils/deviceshell/tst_deviceshell.cpp
index 8c68650504..983c2d35ce 100644
--- a/tests/auto/utils/deviceshell/tst_deviceshell.cpp
+++ b/tests/auto/utils/deviceshell/tst_deviceshell.cpp
@@ -110,7 +110,18 @@ private slots:
}
}
- if (!Utils::HostOsInfo::isWindowsHost()) {
+ // On older versions of macOS, base64 does not understand "-d" ( only "-D" ), so we skip the tests here.
+ const QVersionNumber osVersionNumber = QVersionNumber::fromString(
+ QSysInfo::productVersion());
+
+ const bool isOldMacOS = Utils::HostOsInfo::isMacHost()
+ && osVersionNumber.majorVersion() <= 10
+ && osVersionNumber.minorVersion() <= 14;
+
+ if (isOldMacOS)
+ qWarning() << "Skipping local tests, as macOS version is <= 10.14";
+
+ if (!Utils::HostOsInfo::isWindowsHost() && !isOldMacOS) {
// Windows by default has bash.exe, which does not work unless a working wsl is installed.
// Therefore we only test shells on linux / mac hosts.
const auto shells = {"dash", "bash", "sh", "zsh"};