diff options
author | Dominik Schmidt <dev@dominik-schmidt.de> | 2020-12-14 17:37:05 +0300 |
---|---|---|
committer | Hannah von Reth <vonreth@kde.org> | 2020-12-17 12:30:20 +0300 |
commit | 5ea958a62f55f2ba951c060863dfaa849ec63541 (patch) | |
tree | 744abca8dab2bd80f26d704745e003def94ab565 /test | |
parent | 563bc19345304ee981c6cd19ea37add885265e6c (diff) |
Use owncloudcmd in testVersionOfInstalledBinary
... as it works without X in CI.
Diffstat (limited to 'test')
-rw-r--r-- | test/testutility.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/testutility.cpp b/test/testutility.cpp index b6c590bed..7803d4708 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -8,6 +8,7 @@ #include <QTemporaryDir> #include "common/utility.h" +#include "config.h" using namespace OCC::Utility; @@ -110,13 +111,11 @@ private slots: void testVersionOfInstalledBinary() { if(isLinux()) { - if (qgetenv("DISPLAY").isEmpty()) { - // Current requires an X-Server - return; - } - // pass the binary name owncloud to the next call. This brakes branding, - // but branding is not supposed to work with this. - QString ver = versionOfInstalledBinary(OWNCLOUD_BIN_PATH+QLatin1String("/owncloud")); + // pass the cmd client from our build dir + // this is a bit inaccurate as it does not test the "real thing" + // but cmd and gui have the same --version handler by now + // and cmd works without X in CI + QString ver = versionOfInstalledBinary(QStringLiteral(OWNCLOUD_BIN_PATH "/" APPLICATION_EXECUTABLE "cmd")); qDebug() << "Version of installed ownCloud Binary: " << ver; QVERIFY(!ver.isEmpty()); |