Switch to biicode

.gitignore

@@ -1,2 +0,0 @@
-build.debug
-build.release

CMakeLists.txt

@@ -0,0 +1,101 @@
+INCLUDE(messmer/cmake/tools)
+
+# Initializes block variables
+INIT_BIICODE_BLOCK()
+
+SETUP_GOOGLETEST()
+
+# Actually create targets: EXEcutables and libraries.
+ADD_BIICODE_TARGETS()
+
+ACTIVATE_CPP14()
+
+ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
+TARGET_LINK_LIBRARIES(${BII_BLOCK_TARGET} INTERFACE fuse)
+
+
+# You can safely delete lines from here...
+
+###############################################################################
+#      REFERENCE                                                              #
+###############################################################################
+#
+# This CMakeLists.txt file helps defining your block building and compiling
+# To learn more about the CMake use with biicode, visit http://docs.biicode.com/c++.html
+#
+# ----------------------------------------------------
+# NEW FEATURE! Include cmake files from remote blocks:
+# -----------------------------------------------------
+# Now you can handle cmake dependencies alike you do with c/c++:
+#
+#     INCLUDE(user/block/myrecipe) # include myrecipe.cmake from remote user/block
+#
+# > EXAMPLE: Include our recipes and activate C++11 in your block (http://www.biicode.com/biicode/cmake)
+#
+#     INCLUDE(biicode/cmake/tools) # Include tools.cmake file from "cmake" block from the "biicode" user
+#     ACTIVATE_CPP11(INTERFACE ${BII_BLOCK_TARGET})
+#
+#     Remember to run "bii find" to download out cmake tools file
+#
+# ---------------------
+# INIT_BIICODE_BLOCK()
+# ---------------------
+# This function creates several helper variables as ${BII_BLOCK_NAME} and ${BII_BLOCK_USER}
+# Also it loads variables from the cmake/bii_user_block_vars.cmake
+#     ${BII_LIB_SRC}          File list to create the library
+#     ${BII_LIB_TYPE}         Empty (default, STATIC most casess) STATIC or SHARED
+#     ${BII_LIB_DEPS}         Dependencies to other libraries (user2_block2, user3_blockX)
+#     ${BII_LIB_SYSTEM_HEADERS}  System linking requirements as windows.h, pthread.h, etc
+#
+# You can use or modify them here, for example, to add or remove files from targets based on OS
+# Or use typical cmake configurations done BEFORE defining targets. Examples:
+#     ADD_DEFINITIONS(-DFOO)
+#     FIND_PACKAGE(OpenGL QUIET)
+#     You can add INCLUDE_DIRECTORIES here too
+#
+# ---------------------
+# ADD_BIICODE_TARGETS()
+# ---------------------
+#
+# This function creates the following variables:
+#     ${BII_BLOCK_TARGET}  Interface (no files) target for convenient configuration of all
+#                          targets in this block, as the rest of targets always depend on it
+#                          has name in the form "user_block_interface"
+#     ${BII_LIB_TARGET}  Target library name, usually in the form "user_block". May not exist
+#                        if BII_LIB_SRC is empty
+#     ${BII_BLOCK_TARGETS} List of all targets defined in this block
+#     ${BII_BLOCK_EXES} List of executables targets defined in this block
+#     ${BII_exe_name_TARGET}: Executable target (e.g. ${BII_main_TARGET}. You can also use
+#                            directly the name of the executable target (e.g. user_block_main)
+#
+# > EXAMPLE: Add include directories to all targets of this block
+#
+#    TARGET_INCLUDE_DIRECTORIES(${BII_BLOCK_TARGET} INTERFACE myincludedir)
+#
+#    You can add private include directories to the Lib (if existing)
+#
+# > EXAMPLE: Link with pthread:
+#
+#    TARGET_LINK_LIBRARIES(${BII_BLOCK_TARGET} INTERFACE pthread)
+#        or link against library:
+#    TARGET_LINK_LIBRARIES(${BII_LIB_TARGET} PUBLIC pthread)
+#        or directly use the library target name:
+#    TARGET_LINK_LIBRARIES(user_block PUBLIC pthread)
+#
+#    NOTE:  This can be also done adding pthread to ${BII_LIB_DEPS}
+#            BEFORE calling ADD_BIICODE_TARGETS()
+#
+# > EXAMPLE: how to activate C++11
+#
+#    IF(APPLE)
+#         TARGET_COMPILE_OPTIONS(${BII_BLOCK_TARGET} INTERFACE "-std=c++11 -stdlib=libc++")
+#    ELSEIF (WIN32 OR UNIX)
+#         TARGET_COMPILE_OPTIONS(${BII_BLOCK_TARGET} INTERFACE "-std=c++11")
+#    ENDIF(APPLE)
+#
+# > EXAMPLE: Set properties to target
+#
+#    SET_TARGET_PROPERTIES(${BII_BLOCK_TARGET} PROPERTIES COMPILE_DEFINITIONS "IOV_MAX=255")
+#
+
+

biicode.conf

@@ -0,0 +1,47 @@
+# Biicode configuration file
+
+[requirements]
+	 google/gmock: 2
+	 google/gtest: 10
+	 messmer/cmake: 1
+	 messmer/cpp-utils
+	 messmer/tempfile
+
+[parent]
+    # The parent version of this block. Must match folder name. E.g.
+    # user/block  # No version number means not published yet
+    # You can change it to publish to a different track, and change version, e.g.
+    # user/block(track): 7
+
+[paths]
+    # Local directories to look for headers (within block)
+    # /
+    # include
+
+[dependencies]
+    # Manual adjust file implicit dependencies, add (+), remove (-), or overwrite (=)
+    # hello.h + hello_imp.cpp hello_imp2.cpp
+    # *.h + *.cpp
+    
+    test/main.cpp + test/*.cpp
+
+[mains]
+    # Manual adjust of files that define an executable
+    # !main.cpp  # Do not build executable from this file
+    # main2.cpp # Build it (it doesnt have a main() function, but maybe it includes it)
+
+[hooks]
+    # These are defined equal to [dependencies],files names matching bii*stage*hook.py
+    # will be launched as python scripts at stage = {post_process, clean}
+    # CMakeLists.txt + bii/my_post_process1_hook.py bii_clean_hook.py
+
+[includes]
+    # Mapping of include patterns to external blocks
+    # hello*.h: user3/depblock  # includes will be processed as user3/depblock/hello*.h
+
+[data]
+    # Manually define data files dependencies, that will be copied to bin for execution
+    # By default they are copied to bin/user/block/... which should be taken into account
+    # when loading from disk such data
+    # image.cpp + image.jpg  # code should write open("user/block/image.jpg")
+

fs_interface/Device.h

@@ -19,4 +19,4 @@ public:
 
 }
 
-#endif /* FSPP_DEVICE_H_ */
+#endif

fs_interface/Dir.h

@@ -2,7 +2,7 @@
 #ifndef FSPP_DIR_H_
 #define FSPP_DIR_H_
 
-#include <fspp/fs_interface/Node.h>
+#include "Node.h"
 #include <memory>
 #include <string>
 

fs_interface/OpenFile.h

@@ -23,4 +23,4 @@ public:
 
 }
 
-#endif /* FSPP_OPENFILE_H_ */
+#endif

fuse/Fuse.cpp

@@ -2,7 +2,7 @@
 #include <memory>
 #include <cassert>
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "FuseErrnoException.h"
 #include "Filesystem.h"
 
 using std::unique_ptr;

fuse/Fuse.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <sys/stat.h>
 #include <boost/filesystem.hpp>
-#include "../utils/macros.h"
+#include "messmer/cpp-utils/macros.h"
 
 namespace fspp {
 class Device;

fuse/params.h

@@ -5,4 +5,4 @@
 #define FUSE_USE_VERSION 26
 #include <fuse.h>
 
-#endif /* FSPP_FUSE_PARAMS_H_ */
+#endif

impl/FilesystemImpl.cpp

@@ -2,16 +2,17 @@
 
 #include <memory>
 #include <fcntl.h>
-#include <fspp/fs_interface/Device.h>
-#include <fspp/fs_interface/Dir.h>
+#include "../fs_interface/Device.h"
+#include "../fs_interface/Dir.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
-#include "fspp/fs_interface/File.h"
+#include "../fuse/FuseErrnoException.h"
+#include "../fs_interface/File.h"
 
 
-#include "fspp/utils/pointer.h"
+#include "messmer/cpp-utils/pointer.h"
 
 using namespace fspp;
+using cpputils::dynamic_pointer_move;
 
 using std::unique_ptr;
 using std::make_unique;

impl/FilesystemImpl.h

@@ -3,9 +3,9 @@
 #define FSPP_IMPL_FILESYSTEMIMPL_H_
 
 #include "FuseOpenFileList.h"
-#include "fspp/fuse/Filesystem.h"
+#include "../fuse/Filesystem.h"
 
-#include "fspp/utils/macros.h"
+#include "messmer/cpp-utils/macros.h"
 
 namespace fspp {
 class Node;

impl/FuseOpenFileList.h

@@ -2,9 +2,9 @@
 #ifndef FSPP_IMPL_FUSEOPENFILELIST_H_
 #define FSPP_IMPL_FUSEOPENFILELIST_H_
 
-#include <fspp/fs_interface/File.h>
-#include <fspp/fs_interface/OpenFile.h>
-#include "fspp/utils/macros.h"
+#include "../fs_interface/File.h"
+#include "../fs_interface/OpenFile.h"
+#include "messmer/cpp-utils/macros.h"
 #include "IdList.h"
 
 namespace fspp {

impl/IdList.h

@@ -6,7 +6,7 @@
 #include <memory>
 #include <mutex>
 #include <stdexcept>
-#include "fspp/utils/macros.h"
+#include "messmer/cpp-utils/macros.h"
 
 namespace fspp {
 

src/fspp/CMakeLists.txt

@@ -1,2 +0,0 @@
-add_subdirectory(fuse)
-add_subdirectory(impl)

src/fspp/fuse/CMakeLists.txt

@@ -1,3 +0,0 @@
-add_library(fspp_fuse Fuse.cpp)
-
-target_link_libraries(fspp_fuse fuse fspp_impl boost_filesystem boost_system)

src/fspp/impl/CMakeLists.txt

@@ -1,3 +0,0 @@
-add_library(fspp_impl FilesystemImpl.cpp)
-
-target_link_libraries(fspp_impl boost_filesystem boost_system)

src/fspp/utils/OptionalOwnershipPointer.h

@@ -1,32 +0,0 @@
-#pragma once
-#ifndef FSPP_UTILS_OPTIONALOWNERSHIPPOINTER_H_
-#define FSPP_UTILS_OPTIONALOWNERSHIPPOINTER_H_
-
-#include <memory>
-
-namespace fspp {
-namespace ptr {
-
-template<typename T>
-using optional_ownership_ptr = std::unique_ptr<T, std::function<void(T*)>>;
-
-template<typename T>
-optional_ownership_ptr<T> WithOwnership(std::unique_ptr<T> obj) {
-  auto deleter = obj.get_deleter();
-  return optional_ownership_ptr<T>(obj.release(), [deleter](T* obj){deleter(obj);});
-}
-
-template<typename T>
-optional_ownership_ptr<T> WithoutOwnership(T *obj) {
-  return optional_ownership_ptr<T>(obj, [](T*){});
-}
-
-template<typename T>
-optional_ownership_ptr<T> null() {
-  return WithoutOwnership<T>(nullptr);
-}
-
-}
-}
-
-#endif

src/fspp/utils/macros.h

@@ -1,11 +0,0 @@
-#pragma once
-#ifndef FSPP_UTILS_MACROS_H_
-#define FSPP_UTILS_MACROS_H_
-
-#define DISALLOW_COPY_AND_ASSIGN(Class)        \
-  Class(const Class &rhs) = delete;            \
-  Class &operator=(const Class &rhs) = delete;
-
-#define UNUSED(expr) (void)(expr)
-
-#endif /* FSPP_UTILS_MACROS_H_ */

src/fspp/utils/pointer.h

@@ -1,20 +0,0 @@
-#pragma once
-#ifndef FSPP_UTILS_POINTER_H_
-#define FSPP_UTILS_POINTER_H_
-
-#include <memory>
-
-namespace fspp {
-
-  template<typename DST, typename SRC>
-  inline std::unique_ptr<DST> dynamic_pointer_move(std::unique_ptr<SRC> &source) {
-    //TODO Deleter
-    DST *casted = dynamic_cast<DST*>(source.get());
-    if (casted != nullptr) {
-      source.release();
-    }
-    return std::unique_ptr<DST>(casted);
-  }
-}
-
-#endif

test/fs_interface/DeviceTest.cpp

@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "fspp/fs_interface/Device.h"
+#include "../../fs_interface/Device.h"

test/fs_interface/DirTest.cpp

@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "fspp/fs_interface/Dir.h"
+#include "../../fs_interface/Dir.h"

test/fs_interface/FileTest.cpp

@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "fspp/fs_interface/File.h"
+#include "../../fs_interface/File.h"

test/fs_interface/NodeTest.cpp

@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "fspp/fs_interface/Node.h"
+#include "../../fs_interface/Node.h"

test/fs_interface/OpenFileTest.cpp

@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "fspp/fs_interface/OpenFile.h"
+#include "../../fs_interface/OpenFile.h"

test/fuse/BasicFuseTest.cpp

@@ -1,7 +1,4 @@
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
-#include "test/testutils/FuseTest.h"
+#include "../testutils/FuseTest.h"
 
 using namespace fspp::fuse;
 using namespace fspp::fuse;

test/fuse/FilesystemTest.cpp

@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "fspp/fuse/Filesystem.h"
+#include "../../fuse/Filesystem.h"

test/fuse/access/FuseAccessErrorTest.cpp

@@ -1,8 +1,6 @@
 #include "testutils/FuseAccessTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/access/FuseAccessFilenameTest.cpp

@@ -1,7 +1,4 @@
 #include "testutils/FuseAccessTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/access/FuseAccessModeTest.cpp

@@ -1,7 +1,4 @@
 #include "testutils/FuseAccessTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/access/testutils/FuseAccessTest.h

@@ -2,7 +2,7 @@
 #ifndef TEST_FSPP_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
 #define TEST_FSPP_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 class FuseAccessTest: public FuseTest {
 public:

test/fuse/closeFile/FuseCloseTest.cpp

@@ -1,7 +1,4 @@
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
-#include "test/testutils/FuseTest.h"
+#include "../../testutils/FuseTest.h"
 #include <condition_variable>
 
 using ::testing::_;

test/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseCreateAndOpenTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::Values;

test/fuse/createAndOpenFile/FuseCreateAndOpenFileDescriptorTest.cpp

@@ -1,6 +1,3 @@
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 #include "testutils/FuseCreateAndOpenTest.h"
 
 using ::testing::_;

test/fuse/createAndOpenFile/FuseCreateAndOpenFilenameTest.cpp

@@ -1,6 +1,3 @@
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 #include "testutils/FuseCreateAndOpenTest.h"
 
 using ::testing::_;

test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h

@@ -2,7 +2,7 @@
 #ifndef TEST_FSPP_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
 #define TEST_FSPP_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 class FuseCreateAndOpenTest: public FuseTest {
 public:

test/fuse/fdatasync/FuseFdatasyncErrorTest.cpp

@@ -1,8 +1,6 @@
 #include "testutils/FuseFdatasyncTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFdatasyncTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/fdatasync/testutils/FuseFdatasyncTest.h

@@ -2,7 +2,7 @@
 #ifndef TEST_FSPP_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
 #define TEST_FSPP_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 class FuseFdatasyncTest: public FuseTest {
 public:

test/fuse/flush/FuseFlushErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFlushTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::StrEq;

test/fuse/flush/testutils/FuseFlushTest.h

@@ -2,10 +2,7 @@
 #ifndef TEST_FSPP_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
 #define TEST_FSPP_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 class FuseFlushTest: public FuseTest {
 public:

test/fuse/fstat/FuseFstatErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFstatTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/fstat/FuseFstatParameterTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFstatTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/fstat/testutils/FuseFstatTest.h

@@ -2,7 +2,7 @@
 #ifndef TEST_FSPP_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
 #define TEST_FSPP_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 class FuseFstatTest: public FuseTest {
 public:

test/fuse/fsync/FuseFsyncErrorTest.cpp

@@ -1,8 +1,6 @@
 #include "testutils/FuseFsyncTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/fsync/FuseFsyncFileDescriptorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFsyncTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/fsync/testutils/FuseFsyncTest.h

@@ -2,7 +2,7 @@
 #ifndef TEST_FSPP_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
 #define TEST_FSPP_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 class FuseFsyncTest: public FuseTest {
 public:

test/fuse/ftruncate/FuseFTruncateErrorTest.cpp

@@ -1,8 +1,6 @@
 #include "testutils/FuseFTruncateTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFTruncateTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/ftruncate/FuseFTruncateSizeTest.cpp

@@ -1,7 +1,4 @@
 #include "testutils/FuseFTruncateTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/ftruncate/testutils/FuseFTruncateTest.h

@@ -2,7 +2,7 @@
 #ifndef TEST_FSPP_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
 #define TEST_FSPP_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 class FuseFTruncateTest: public FuseTest {
 public:

test/fuse/lstat/FuseLstatErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseLstatTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::StrEq;
 using ::testing::_;

test/fuse/lstat/testutils/FuseLstatTest.h

@@ -2,13 +2,11 @@
 #ifndef TEST_FSPP_FUSE_LSTAT_FUSELSTATTEST_H_
 #define TEST_FSPP_FUSE_LSTAT_FUSELSTATTEST_H_
 
-#include "gmock/gmock.h"
-
 #include <string>
 #include <functional>
 #include <sys/stat.h>
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 // This class offers some utility functions for testing lstat().
 class FuseLstatTest: public FuseTest {

test/fuse/mkdir/FuseMkdirDirnameTest.cpp

@@ -1,7 +1,4 @@
 #include "testutils/FuseMkdirTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/mkdir/FuseMkdirErrorTest.cpp

@@ -1,8 +1,6 @@
 #include "testutils/FuseMkdirTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/mkdir/FuseMkdirModeTest.cpp

@@ -1,7 +1,4 @@
 #include "testutils/FuseMkdirTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/mkdir/testutils/FuseMkdirTest.cpp

@@ -1,4 +1,4 @@
-#include <test/fspp/fuse/mkdir/testutils/FuseMkdirTest.h>
+#include "FuseMkdirTest.h"
 
 using ::testing::Action;
 using ::testing::Invoke;

test/fuse/mkdir/testutils/FuseMkdirTest.h

@@ -2,7 +2,7 @@
 #ifndef TEST_FSPP_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
 #define TEST_FSPP_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 class FuseMkdirTest: public FuseTest {
 public:

test/fuse/openFile/FuseOpenErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseOpenTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::Values;

test/fuse/openFile/FuseOpenFileDescriptorTest.cpp

@@ -1,6 +1,3 @@
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 #include "testutils/FuseOpenTest.h"
 
 using ::testing::_;

test/fuse/openFile/FuseOpenFilenameTest.cpp

@@ -1,6 +1,3 @@
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 #include "testutils/FuseOpenTest.h"
 
 using ::testing::_;

test/fuse/openFile/testutils/FuseOpenTest.h

@@ -2,7 +2,7 @@
 #ifndef TEST_FSPP_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
 #define TEST_FSPP_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 class FuseOpenTest: public FuseTest {
 public:

test/fuse/read/FuseReadErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseReadTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/read/FuseReadFileDescriptorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseReadTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/read/FuseReadOverflowTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseReadTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/read/FuseReadReturnedDataTest.cpp

@@ -1,7 +1,7 @@
-#include <test/testutils/DataBlockFixture.h>
+#include "../../testutils/DataBlockFixture.h"
 #include "testutils/FuseReadTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 #include <tuple>
 #include <cstdlib>

test/fuse/read/testutils/FuseReadTest.h

@@ -2,7 +2,7 @@
 #ifndef TEST_FSPP_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
 #define TEST_FSPP_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 
 class FuseReadTest: public FuseTest {
 public:

test/fuse/readDir/FuseReadDirDirnameTest.cpp

@@ -1,6 +1,3 @@
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 #include "testutils/FuseReadDirTest.h"
 
 using ::testing::_;

test/fuse/readDir/FuseReadDirErrorTest.cpp

@@ -1,9 +1,6 @@
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 #include "testutils/FuseReadDirTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/readDir/FuseReadDirReturnTest.cpp

@@ -1,9 +1,6 @@
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
 #include "testutils/FuseReadDirTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fuse/readDir/testutils/FuseReadDirTest.h

@@ -2,7 +2,7 @@
 #ifndef TEST_FSPP_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
 #define TEST_FSPP_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
 
-#include "test/testutils/FuseTest.h"
+#include "../../../testutils/FuseTest.h"
 #include <dirent.h>
 
 class FuseReadDirTest: public FuseTest {

test/fuse/rename/FuseRenameErrorTest.cpp

@@ -1,8 +1,5 @@
 #include "testutils/FuseRenameTest.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
-#include "fspp/fuse/FuseErrnoException.h"
+#include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;