mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-25 22:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use owncloudcmd in testVersionOfInstalledBinary

Browse source 
... as it works without X in CI.
This commit is contained in:
Dominik Schmidt 2020-12-14 15:37:05 +01:00 committed by Kevin Ottens
parent 635d2b2da2
commit 67f9890320
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
test/testutility.cpp
View file

@ -8,6 +8,7 @@
#include <QTemporaryDir>
#include "common/utility.h"
#include "config.h"
using namespace OCC::Utility;
@ -115,13 +116,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("/nextcloud"));
// 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 Nextcloud: " << ver;
QVERIFY(!ver.isEmpty());