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

Use OWNCLOUD_BIN_DIR directly in C++ code.

Browse source 
No need to do a STR replacement and the macro changing the path.
It actually broke test execution for Debian.

See https://bugs.debian.org/844937
This commit is contained in:
Hefee 2017-07-06 08:41:02 +02:00
parent ce8341ca1f
commit 607287a9d6
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/owncloud_add_test.cmake
View file

@ -22,7 +22,7 @@ macro(owncloud_add_test test_class additional_cpp)
) )
add_definitions(-DOWNCLOUD_TEST) add_definitions(-DOWNCLOUD_TEST)
add_definitions(-DOWNCLOUD_BIN_PATH=${CMAKE_BINARY_DIR}/bin) add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
add_test(NAME ${OWNCLOUD_TEST_CLASS}Test COMMAND ${OWNCLOUD_TEST_CLASS}Test) add_test(NAME ${OWNCLOUD_TEST_CLASS}Test COMMAND ${OWNCLOUD_TEST_CLASS}Test)
endmacro() endmacro()
@ -51,5 +51,5 @@ macro(owncloud_add_benchmark test_class additional_cpp)
) )
add_definitions(-DOWNCLOUD_TEST) add_definitions(-DOWNCLOUD_TEST)
add_definitions(-DOWNCLOUD_BIN_PATH=${CMAKE_BINARY_DIR}/bin) add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
endmacro() endmacro()

6
test/testutility.cpp
View file

@ -11,10 +11,6 @@
#include "utility.h" #include "utility.h"
#define STR_(X) #X
#define STR(X) STR_(X)
#define BIN_PATH STR(OWNCLOUD_BIN_PATH)
using namespace OCC::Utility; using namespace OCC::Utility;
class TestUtility : public QObject class TestUtility : public QObject
@ -118,7 +114,7 @@ private slots:
} }
// pass the binary name owncloud to the next call. This brakes branding, // pass the binary name owncloud to the next call. This brakes branding,
// but branding is not supposed to work with this. // but branding is not supposed to work with this.
QString ver = versionOfInstalledBinary(BIN_PATH+QLatin1String("/owncloud")); QString ver = versionOfInstalledBinary(OWNCLOUD_BIN_PATH+QLatin1String("/owncloud"));
qDebug() << "Version of installed ownCloud Binary: " << ver; qDebug() << "Version of installed ownCloud Binary: " << ver;
QVERIFY( !ver.isEmpty()); QVERIFY( !ver.isEmpty());