diff options
| author | Jocelyn Turcotte <jturcotte@woboq.com> | 2017-08-16 09:36:52 +0300 |
|---|---|---|
| committer | Jocelyn Turcotte <jturcotte@woboq.com> | 2017-09-05 18:25:19 +0300 |
| commit | cf15cbf0b3fb2c25148d3a9f21d1a47405a43e94 (patch) | |
| tree | d7ff0fa3adf5bacda4169f7be24c8a1a5ead3b28 /test | |
| parent | de7c3016540b2612293cda98586f53be9a21b4ae (diff) | |
Move Utility to a new common static library
Now that csync builds as C++, this will avoid having to implement
functionalities needed by csync mandatorily in csync itself.
This library is built as part of libocsync and symbols exported
through it.
This requires a relicense of Utility as LGPL. All classes moved into
this library from src/libsync will need to be relicensed as well.
Diffstat (limited to 'test')
| -rw-r--r-- | test/csync/csync_tests/check_csync_misc.cpp | 3 | ||||
| -rw-r--r-- | test/testchecksumvalidator.cpp | 2 | ||||
| -rw-r--r-- | test/testfilesystem.cpp | 2 | ||||
| -rw-r--r-- | test/testfolder.cpp | 2 | ||||
| -rw-r--r-- | test/testfolderman.cpp | 2 | ||||
| -rw-r--r-- | test/testfolderwatcher.cpp | 2 | ||||
| -rw-r--r-- | test/testinotifywatcher.cpp | 2 | ||||
| -rw-r--r-- | test/testutility.cpp | 2 |
8 files changed, 8 insertions, 9 deletions
diff --git a/test/csync/csync_tests/check_csync_misc.cpp b/test/csync/csync_tests/check_csync_misc.cpp index 80736b825..64f95694b 100644 --- a/test/csync/csync_tests/check_csync_misc.cpp +++ b/test/csync/csync_tests/check_csync_misc.cpp @@ -17,10 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "torture.h" - #include "csync_misc.h" #include <stdlib.h> +#include "torture.h" static void check_csync_normalize_etag(void **state) { diff --git a/test/testchecksumvalidator.cpp b/test/testchecksumvalidator.cpp index 88c3b1d34..fd1988eab 100644 --- a/test/testchecksumvalidator.cpp +++ b/test/testchecksumvalidator.cpp @@ -11,7 +11,7 @@ #include "checksums.h" #include "networkjobs.h" -#include "utility.h" +#include "common/utility.h" #include "filesystem.h" #include "propagatorjobs.h" diff --git a/test/testfilesystem.cpp b/test/testfilesystem.cpp index a9b3f2b9f..0b8b61246 100644 --- a/test/testfilesystem.cpp +++ b/test/testfilesystem.cpp @@ -8,7 +8,7 @@ #include <QDebug> #include "filesystem.h" -#include "utility.h" +#include "common/utility.h" using namespace OCC::Utility; using namespace OCC::FileSystem; diff --git a/test/testfolder.cpp b/test/testfolder.cpp index e8775ac06..986c588eb 100644 --- a/test/testfolder.cpp +++ b/test/testfolder.cpp @@ -7,7 +7,7 @@ #include <QtTest> -#include "utility.h" +#include "common/utility.h" #include "folder.h" using namespace OCC; diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp index b6e6478f5..78a2dd71a 100644 --- a/test/testfolderman.cpp +++ b/test/testfolderman.cpp @@ -11,7 +11,7 @@ #endif #include <QtTest> -#include "utility.h" +#include "common/utility.h" #include "folderman.h" #include "account.h" #include "accountstate.h" diff --git a/test/testfolderwatcher.cpp b/test/testfolderwatcher.cpp index 1cb231cf6..0f8551db6 100644 --- a/test/testfolderwatcher.cpp +++ b/test/testfolderwatcher.cpp @@ -8,7 +8,7 @@ #include <QtTest> #include "folderwatcher.h" -#include "utility.h" +#include "common/utility.h" void touch(const QString &file) { diff --git a/test/testinotifywatcher.cpp b/test/testinotifywatcher.cpp index 799b09da9..2d8cf937d 100644 --- a/test/testinotifywatcher.cpp +++ b/test/testinotifywatcher.cpp @@ -7,7 +7,7 @@ #include <QtTest> #include "folderwatcher_linux.h" -#include "utility.h" +#include "common/utility.h" using namespace OCC; diff --git a/test/testutility.cpp b/test/testutility.cpp index 5093ce76d..5e86a336e 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -9,7 +9,7 @@ #include <QTemporaryDir> #endif -#include "utility.h" +#include "common/utility.h" using namespace OCC::Utility; |