From e48188f4704da5ab9d580498a1a60e12c0d81b85 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Tue, 23 Feb 2016 21:07:23 +0100 Subject: [PATCH] Restructure project to allow factoring out a library --- .travis.yml | 1 + src/CMakeLists.txt | 3 +- src/cryfs-cli/CMakeLists.txt | 29 +++++ .../cli => cryfs-cli}/CallAfterTimeout.cpp | 0 .../cli => cryfs-cli}/CallAfterTimeout.h | 0 src/{cryfs/cli => cryfs-cli}/Cli.cpp | 4 +- src/{cryfs/cli => cryfs-cli}/Cli.h | 2 +- src/{cryfs/cli => cryfs-cli}/Environment.cpp | 0 src/{cryfs/cli => cryfs-cli}/Environment.h | 0 .../cli => cryfs-cli}/VersionChecker.cpp | 0 src/{cryfs/cli => cryfs-cli}/VersionChecker.h | 0 .../cli => cryfs-cli}/VersionCompare.cpp | 0 src/{cryfs/cli => cryfs-cli}/VersionCompare.h | 0 src/{cryfs => cryfs-cli}/main.cpp | 2 +- .../program_options/Parser.cpp | 2 +- .../program_options/Parser.h | 0 .../program_options/ProgramOptions.cpp | 0 .../program_options/ProgramOptions.h | 0 .../program_options/utils.cpp | 0 .../cli => cryfs-cli}/program_options/utils.h | 0 src/cryfs/CMakeLists.txt | 109 ++++++++---------- src/cryfs/cryfs.cpp | 20 ++++ src/cryfs/cryfs.h | 19 +++ test/CMakeLists.txt | 1 + test/cryfs-cli/CMakeLists.txt | 22 ++++ .../CallAfterTimeoutTest.cpp | 2 +- .../cli => cryfs-cli}/CliTest_Setup.cpp | 0 .../cli => cryfs-cli}/CliTest_ShowingHelp.cpp | 0 .../CliTest_WrongEnvironment.cpp | 0 .../cli => cryfs-cli}/EnvironmentTest.cpp | 2 +- .../cli => cryfs-cli}/VersionCheckerTest.cpp | 2 +- .../cli => cryfs-cli}/VersionCompareTest.cpp | 2 +- .../program_options/ParserTest.cpp | 2 +- .../program_options/ProgramOptionsTest.cpp | 2 +- .../program_options/UtilsTest.cpp | 2 +- .../testutils/ProgramOptionsTestBase.h | 0 .../cli => cryfs-cli}/testutils/CliTest.cpp | 0 .../cli => cryfs-cli}/testutils/CliTest.h | 6 +- test/cryfs/CMakeLists.txt | 13 +-- test/cryfs/config/CryConfigFileTest.cpp | 1 - test/cryfs/config/CryConfigTest.cpp | 1 - 41 files changed, 159 insertions(+), 90 deletions(-) create mode 100644 src/cryfs-cli/CMakeLists.txt rename src/{cryfs/cli => cryfs-cli}/CallAfterTimeout.cpp (100%) rename src/{cryfs/cli => cryfs-cli}/CallAfterTimeout.h (100%) rename src/{cryfs/cli => cryfs-cli}/Cli.cpp (99%) rename src/{cryfs/cli => cryfs-cli}/Cli.h (98%) rename src/{cryfs/cli => cryfs-cli}/Environment.cpp (100%) rename src/{cryfs/cli => cryfs-cli}/Environment.h (100%) rename src/{cryfs/cli => cryfs-cli}/VersionChecker.cpp (100%) rename src/{cryfs/cli => cryfs-cli}/VersionChecker.h (100%) rename src/{cryfs/cli => cryfs-cli}/VersionCompare.cpp (100%) rename src/{cryfs/cli => cryfs-cli}/VersionCompare.h (100%) rename src/{cryfs => cryfs-cli}/main.cpp (95%) rename src/{cryfs/cli => cryfs-cli}/program_options/Parser.cpp (99%) rename src/{cryfs/cli => cryfs-cli}/program_options/Parser.h (100%) rename src/{cryfs/cli => cryfs-cli}/program_options/ProgramOptions.cpp (100%) rename src/{cryfs/cli => cryfs-cli}/program_options/ProgramOptions.h (100%) rename src/{cryfs/cli => cryfs-cli}/program_options/utils.cpp (100%) rename src/{cryfs/cli => cryfs-cli}/program_options/utils.h (100%) create mode 100644 src/cryfs/cryfs.cpp create mode 100644 src/cryfs/cryfs.h create mode 100644 test/cryfs-cli/CMakeLists.txt rename test/{cryfs/cli => cryfs-cli}/CallAfterTimeoutTest.cpp (97%) rename test/{cryfs/cli => cryfs-cli}/CliTest_Setup.cpp (100%) rename test/{cryfs/cli => cryfs-cli}/CliTest_ShowingHelp.cpp (100%) rename test/{cryfs/cli => cryfs-cli}/CliTest_WrongEnvironment.cpp (100%) rename test/{cryfs/cli => cryfs-cli}/EnvironmentTest.cpp (98%) rename test/{cryfs/cli => cryfs-cli}/VersionCheckerTest.cpp (99%) rename test/{cryfs/cli => cryfs-cli}/VersionCompareTest.cpp (97%) rename test/{cryfs/cli => cryfs-cli}/program_options/ParserTest.cpp (99%) rename test/{cryfs/cli => cryfs-cli}/program_options/ProgramOptionsTest.cpp (98%) rename test/{cryfs/cli => cryfs-cli}/program_options/UtilsTest.cpp (99%) rename test/{cryfs/cli => cryfs-cli}/program_options/testutils/ProgramOptionsTestBase.h (100%) rename test/{cryfs/cli => cryfs-cli}/testutils/CliTest.cpp (100%) rename test/{cryfs/cli => cryfs-cli}/testutils/CliTest.h (96%) diff --git a/.travis.yml b/.travis.yml index 86ccbae7..0c2c617e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,5 +41,6 @@ script: - ./test/blobstore/blobstore-test # TODO Also run on osx once fixed - if [ "${TRAVIS_OS_NAME}" == "linux"]; then ./test/cryfs/cryfs-test ; fi +- if [ "${TRAVIS_OS_NAME}" == "linux"]; then ./test/cryfs/cryfs-cli-test ; fi after_script: - rm run_with_fuse.sh diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c8b7741e..d053f034 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,4 +5,5 @@ add_subdirectory(fspp) add_subdirectory(parallelaccessstore) add_subdirectory(blockstore) add_subdirectory(blobstore) -add_subdirectory(cryfs) \ No newline at end of file +add_subdirectory(cryfs) +add_subdirectory(cryfs-cli) diff --git a/src/cryfs-cli/CMakeLists.txt b/src/cryfs-cli/CMakeLists.txt new file mode 100644 index 00000000..3a32be3d --- /dev/null +++ b/src/cryfs-cli/CMakeLists.txt @@ -0,0 +1,29 @@ +project (cryfs-cli) + +set(SOURCES + Cli.cpp + VersionChecker.cpp + VersionCompare.cpp + CallAfterTimeout.cpp + Environment.cpp + program_options/utils.cpp + program_options/ProgramOptions.cpp + program_options/Parser.cpp +) + +add_library(${PROJECT_NAME} ${SOURCES}) +target_link_libraries(${PROJECT_NAME} PUBLIC cryfs cpp-utils) +target_enable_style_warnings(${PROJECT_NAME}) +target_activate_cpp14(${PROJECT_NAME}) +target_git_version_init(${PROJECT_NAME}) + +add_executable(${PROJECT_NAME}_bin main.cpp) +set_target_properties(${PROJECT_NAME}_bin PROPERTIES OUTPUT_NAME cryfs) +target_link_libraries(${PROJECT_NAME}_bin PUBLIC ${PROJECT_NAME}) +target_enable_style_warnings(${PROJECT_NAME}_bin) +target_activate_cpp14(${PROJECT_NAME}_bin) + +install(TARGETS ${PROJECT_NAME}_bin + DESTINATION bin + CONFIGURATIONS Release +) diff --git a/src/cryfs/cli/CallAfterTimeout.cpp b/src/cryfs-cli/CallAfterTimeout.cpp similarity index 100% rename from src/cryfs/cli/CallAfterTimeout.cpp rename to src/cryfs-cli/CallAfterTimeout.cpp diff --git a/src/cryfs/cli/CallAfterTimeout.h b/src/cryfs-cli/CallAfterTimeout.h similarity index 100% rename from src/cryfs/cli/CallAfterTimeout.h rename to src/cryfs-cli/CallAfterTimeout.h diff --git a/src/cryfs/cli/Cli.cpp b/src/cryfs-cli/Cli.cpp similarity index 99% rename from src/cryfs/cli/Cli.cpp rename to src/cryfs-cli/Cli.cpp index e1ea622a..5a4b4e5d 100644 --- a/src/cryfs/cli/Cli.cpp +++ b/src/cryfs-cli/Cli.cpp @@ -12,8 +12,8 @@ #include #include #include -#include "../filesystem/CryDevice.h" -#include "../config/CryConfigLoader.h" +#include +#include #include "program_options/Parser.h" #include diff --git a/src/cryfs/cli/Cli.h b/src/cryfs-cli/Cli.h similarity index 98% rename from src/cryfs/cli/Cli.h rename to src/cryfs-cli/Cli.h index 587781a4..ee9919a7 100644 --- a/src/cryfs/cli/Cli.h +++ b/src/cryfs-cli/Cli.h @@ -3,7 +3,7 @@ #define MESSMER_CRYFS_CLI_H #include "program_options/ProgramOptions.h" -#include "../config/CryConfigFile.h" +#include #include #include #include diff --git a/src/cryfs/cli/Environment.cpp b/src/cryfs-cli/Environment.cpp similarity index 100% rename from src/cryfs/cli/Environment.cpp rename to src/cryfs-cli/Environment.cpp diff --git a/src/cryfs/cli/Environment.h b/src/cryfs-cli/Environment.h similarity index 100% rename from src/cryfs/cli/Environment.h rename to src/cryfs-cli/Environment.h diff --git a/src/cryfs/cli/VersionChecker.cpp b/src/cryfs-cli/VersionChecker.cpp similarity index 100% rename from src/cryfs/cli/VersionChecker.cpp rename to src/cryfs-cli/VersionChecker.cpp diff --git a/src/cryfs/cli/VersionChecker.h b/src/cryfs-cli/VersionChecker.h similarity index 100% rename from src/cryfs/cli/VersionChecker.h rename to src/cryfs-cli/VersionChecker.h diff --git a/src/cryfs/cli/VersionCompare.cpp b/src/cryfs-cli/VersionCompare.cpp similarity index 100% rename from src/cryfs/cli/VersionCompare.cpp rename to src/cryfs-cli/VersionCompare.cpp diff --git a/src/cryfs/cli/VersionCompare.h b/src/cryfs-cli/VersionCompare.h similarity index 100% rename from src/cryfs/cli/VersionCompare.h rename to src/cryfs-cli/VersionCompare.h diff --git a/src/cryfs/main.cpp b/src/cryfs-cli/main.cpp similarity index 95% rename from src/cryfs/main.cpp rename to src/cryfs-cli/main.cpp index 8df6740d..fc39c34c 100644 --- a/src/cryfs/main.cpp +++ b/src/cryfs-cli/main.cpp @@ -1,4 +1,4 @@ -#include "cli/Cli.h" +#include "Cli.h" #include #include #include diff --git a/src/cryfs/cli/program_options/Parser.cpp b/src/cryfs-cli/program_options/Parser.cpp similarity index 99% rename from src/cryfs/cli/program_options/Parser.cpp rename to src/cryfs-cli/program_options/Parser.cpp index 0d81e3f1..6a8dc999 100644 --- a/src/cryfs/cli/program_options/Parser.cpp +++ b/src/cryfs-cli/program_options/Parser.cpp @@ -2,7 +2,7 @@ #include "utils.h" #include #include -#include +#include namespace po = boost::program_options; namespace bf = boost::filesystem; diff --git a/src/cryfs/cli/program_options/Parser.h b/src/cryfs-cli/program_options/Parser.h similarity index 100% rename from src/cryfs/cli/program_options/Parser.h rename to src/cryfs-cli/program_options/Parser.h diff --git a/src/cryfs/cli/program_options/ProgramOptions.cpp b/src/cryfs-cli/program_options/ProgramOptions.cpp similarity index 100% rename from src/cryfs/cli/program_options/ProgramOptions.cpp rename to src/cryfs-cli/program_options/ProgramOptions.cpp diff --git a/src/cryfs/cli/program_options/ProgramOptions.h b/src/cryfs-cli/program_options/ProgramOptions.h similarity index 100% rename from src/cryfs/cli/program_options/ProgramOptions.h rename to src/cryfs-cli/program_options/ProgramOptions.h diff --git a/src/cryfs/cli/program_options/utils.cpp b/src/cryfs-cli/program_options/utils.cpp similarity index 100% rename from src/cryfs/cli/program_options/utils.cpp rename to src/cryfs-cli/program_options/utils.cpp diff --git a/src/cryfs/cli/program_options/utils.h b/src/cryfs-cli/program_options/utils.h similarity index 100% rename from src/cryfs/cli/program_options/utils.h rename to src/cryfs-cli/program_options/utils.h diff --git a/src/cryfs/CMakeLists.txt b/src/cryfs/CMakeLists.txt index a4adcb44..1e3866de 100644 --- a/src/cryfs/CMakeLists.txt +++ b/src/cryfs/CMakeLists.txt @@ -1,67 +1,56 @@ project (cryfs) -set(SOURCES - cli/Cli.cpp - cli/VersionChecker.cpp - cli/VersionCompare.cpp - cli/CallAfterTimeout.cpp - cli/Environment.cpp - cli/program_options/utils.cpp - cli/program_options/ProgramOptions.cpp - cli/program_options/Parser.cpp - config/crypto/outer/OuterConfig.cpp - config/crypto/outer/OuterEncryptor.cpp - config/crypto/CryConfigEncryptorFactory.cpp - config/crypto/inner/ConcreteInnerEncryptor.cpp - config/crypto/inner/InnerConfig.cpp - config/crypto/inner/InnerEncryptor.cpp - config/crypto/CryConfigEncryptor.cpp - config/CryConfigConsole.cpp - config/CryConfigLoader.cpp - config/CryConfig.cpp - config/CryConfigFile.cpp - config/CryCipher.cpp - config/CryConfigCreator.cpp - filesystem/CryOpenFile.cpp - filesystem/fsblobstore/utils/DirEntry.cpp - filesystem/fsblobstore/utils/DirEntryList.cpp - filesystem/fsblobstore/FsBlobStore.cpp - filesystem/fsblobstore/FsBlobView.cpp - filesystem/fsblobstore/FileBlob.cpp - filesystem/fsblobstore/FsBlob.cpp - filesystem/fsblobstore/SymlinkBlob.cpp - filesystem/fsblobstore/DirBlob.cpp - filesystem/CryNode.cpp - filesystem/parallelaccessfsblobstore/DirBlobRef.cpp - filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp - filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp - filesystem/parallelaccessfsblobstore/FsBlobRef.cpp - filesystem/parallelaccessfsblobstore/FileBlobRef.cpp - filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp - filesystem/CrySymlink.cpp - filesystem/CryDir.cpp - filesystem/cachingfsblobstore/DirBlobRef.cpp - filesystem/cachingfsblobstore/CachingFsBlobStore.cpp - filesystem/cachingfsblobstore/FsBlobRef.cpp - filesystem/cachingfsblobstore/FileBlobRef.cpp - filesystem/cachingfsblobstore/SymlinkBlobRef.cpp - filesystem/CryFile.cpp - filesystem/CryDevice.cpp +set(LIB_SOURCES +# cryfs.cpp + config/crypto/outer/OuterConfig.cpp + config/crypto/outer/OuterEncryptor.cpp + config/crypto/CryConfigEncryptorFactory.cpp + config/crypto/inner/ConcreteInnerEncryptor.cpp + config/crypto/inner/InnerConfig.cpp + config/crypto/inner/InnerEncryptor.cpp + config/crypto/CryConfigEncryptor.cpp + config/CryConfigConsole.cpp + config/CryConfigLoader.cpp + config/CryConfig.cpp + config/CryConfigFile.cpp + config/CryCipher.cpp + config/CryConfigCreator.cpp + filesystem/CryOpenFile.cpp + filesystem/fsblobstore/utils/DirEntry.cpp + filesystem/fsblobstore/utils/DirEntryList.cpp + filesystem/fsblobstore/FsBlobStore.cpp + filesystem/fsblobstore/FsBlobView.cpp + filesystem/fsblobstore/FileBlob.cpp + filesystem/fsblobstore/FsBlob.cpp + filesystem/fsblobstore/SymlinkBlob.cpp + filesystem/fsblobstore/DirBlob.cpp + filesystem/CryNode.cpp + filesystem/parallelaccessfsblobstore/DirBlobRef.cpp + filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp + filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp + filesystem/parallelaccessfsblobstore/FsBlobRef.cpp + filesystem/parallelaccessfsblobstore/FileBlobRef.cpp + filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp + filesystem/CrySymlink.cpp + filesystem/CryDir.cpp + filesystem/cachingfsblobstore/DirBlobRef.cpp + filesystem/cachingfsblobstore/CachingFsBlobStore.cpp + filesystem/cachingfsblobstore/FsBlobRef.cpp + filesystem/cachingfsblobstore/FileBlobRef.cpp + filesystem/cachingfsblobstore/SymlinkBlobRef.cpp + filesystem/CryFile.cpp + filesystem/CryDevice.cpp ) -add_library(${PROJECT_NAME}_lib STATIC ${SOURCES}) -target_link_libraries(${PROJECT_NAME}_lib PUBLIC cpp-utils blockstore blobstore fspp) -target_add_boost(${PROJECT_NAME}_lib program_options chrono) -target_enable_style_warnings(${PROJECT_NAME}_lib) -target_activate_cpp14(${PROJECT_NAME}_lib) -target_git_version_init(${PROJECT_NAME}_lib) - -add_executable(${PROJECT_NAME} main.cpp) -target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib) +add_library(${PROJECT_NAME} STATIC ${LIB_SOURCES}) +set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME cryfs) +target_link_libraries(${PROJECT_NAME} PRIVATE cpp-utils blockstore blobstore fspp) # TODO Check that dependent projects don't get this linked in +target_add_boost(${PROJECT_NAME} program_options chrono) # TODO Check that dependent projects don't get boost added (use PRIVATE here) target_enable_style_warnings(${PROJECT_NAME}) target_activate_cpp14(${PROJECT_NAME}) +target_git_version_init(${PROJECT_NAME}) -install(TARGETS cryfs - COMPONENT cryfs-cli - DESTINATION bin - CONFIGURATIONS Release) +#install(TARGETS ${PROJECT_NAME} +# DESTINATION lib +# CONFIGURATIONS Release +#) diff --git a/src/cryfs/cryfs.cpp b/src/cryfs/cryfs.cpp new file mode 100644 index 00000000..48aa8d12 --- /dev/null +++ b/src/cryfs/cryfs.cpp @@ -0,0 +1,20 @@ +#include "cryfs.h" + +class cryfs_load_handle { +public: + cryfs_load_handle(const char *value_): value(value_) {} + + const char *value; +}; + +cryfs_load_handle *cryfs_load_init() { + return new cryfs_load_handle("Hello Library World!"); +} + +void cryfs_load_free(cryfs_load_handle *handle) { + delete handle; +} + +const char *cryfs_test(cryfs_load_handle *handle) { + return handle->value; +} diff --git a/src/cryfs/cryfs.h b/src/cryfs/cryfs.h new file mode 100644 index 00000000..bfaa306d --- /dev/null +++ b/src/cryfs/cryfs.h @@ -0,0 +1,19 @@ +#pragma once +#ifndef MESSMER_CRYFS_CRYFS_H +#define MESSMER_CRYFS_CRYFS_H + +#ifdef __cplusplus +extern "C" { +#endif + +struct cryfs_load_handle; + +cryfs_load_handle *cryfs_load_init(); +void cryfs_load_free(cryfs_load_handle *handle); +const char *cryfs_test(cryfs_load_handle *handle); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 89a5bcdd..fab6dc78 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -7,4 +7,5 @@ if (BUILD_TESTING) add_subdirectory(blockstore) add_subdirectory(blobstore) add_subdirectory(cryfs) + add_subdirectory(cryfs-cli) endif(BUILD_TESTING) diff --git a/test/cryfs-cli/CMakeLists.txt b/test/cryfs-cli/CMakeLists.txt new file mode 100644 index 00000000..dc1c6d9d --- /dev/null +++ b/test/cryfs-cli/CMakeLists.txt @@ -0,0 +1,22 @@ +project (cryfs-cli-test) + +set(SOURCES + CallAfterTimeoutTest.cpp + testutils/CliTest.cpp + CliTest_Setup.cpp + CliTest_WrongEnvironment.cpp + program_options/UtilsTest.cpp + program_options/ProgramOptionsTest.cpp + program_options/ParserTest.cpp + CliTest_ShowingHelp.cpp + EnvironmentTest.cpp + VersionCheckerTest.cpp + VersionCompareTest.cpp +) + +add_executable(${PROJECT_NAME} ${SOURCES}) +target_link_libraries(${PROJECT_NAME} googletest cryfs-cli) +add_test(${PROJECT_NAME} ${PROJECT_NAME}) + +target_enable_style_warnings(${PROJECT_NAME}) +target_activate_cpp14(${PROJECT_NAME}) diff --git a/test/cryfs/cli/CallAfterTimeoutTest.cpp b/test/cryfs-cli/CallAfterTimeoutTest.cpp similarity index 97% rename from test/cryfs/cli/CallAfterTimeoutTest.cpp rename to test/cryfs-cli/CallAfterTimeoutTest.cpp index 35333e65..3f28456d 100644 --- a/test/cryfs/cli/CallAfterTimeoutTest.cpp +++ b/test/cryfs-cli/CallAfterTimeoutTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include using cpputils::unique_ref; using cpputils::make_unique_ref; diff --git a/test/cryfs/cli/CliTest_Setup.cpp b/test/cryfs-cli/CliTest_Setup.cpp similarity index 100% rename from test/cryfs/cli/CliTest_Setup.cpp rename to test/cryfs-cli/CliTest_Setup.cpp diff --git a/test/cryfs/cli/CliTest_ShowingHelp.cpp b/test/cryfs-cli/CliTest_ShowingHelp.cpp similarity index 100% rename from test/cryfs/cli/CliTest_ShowingHelp.cpp rename to test/cryfs-cli/CliTest_ShowingHelp.cpp diff --git a/test/cryfs/cli/CliTest_WrongEnvironment.cpp b/test/cryfs-cli/CliTest_WrongEnvironment.cpp similarity index 100% rename from test/cryfs/cli/CliTest_WrongEnvironment.cpp rename to test/cryfs-cli/CliTest_WrongEnvironment.cpp diff --git a/test/cryfs/cli/EnvironmentTest.cpp b/test/cryfs-cli/EnvironmentTest.cpp similarity index 98% rename from test/cryfs/cli/EnvironmentTest.cpp rename to test/cryfs-cli/EnvironmentTest.cpp index 8c1a312e..48126530 100644 --- a/test/cryfs/cli/EnvironmentTest.cpp +++ b/test/cryfs-cli/EnvironmentTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include using namespace cryfs; diff --git a/test/cryfs/cli/VersionCheckerTest.cpp b/test/cryfs-cli/VersionCheckerTest.cpp similarity index 99% rename from test/cryfs/cli/VersionCheckerTest.cpp rename to test/cryfs-cli/VersionCheckerTest.cpp index 6f8c14d2..66950038 100644 --- a/test/cryfs/cli/VersionCheckerTest.cpp +++ b/test/cryfs-cli/VersionCheckerTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/test/cryfs/cli/VersionCompareTest.cpp b/test/cryfs-cli/VersionCompareTest.cpp similarity index 97% rename from test/cryfs/cli/VersionCompareTest.cpp rename to test/cryfs-cli/VersionCompareTest.cpp index f1bc75f4..0b60c848 100644 --- a/test/cryfs/cli/VersionCompareTest.cpp +++ b/test/cryfs-cli/VersionCompareTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace cryfs; using std::string; diff --git a/test/cryfs/cli/program_options/ParserTest.cpp b/test/cryfs-cli/program_options/ParserTest.cpp similarity index 99% rename from test/cryfs/cli/program_options/ParserTest.cpp rename to test/cryfs-cli/program_options/ParserTest.cpp index 13e62da0..0539462b 100644 --- a/test/cryfs/cli/program_options/ParserTest.cpp +++ b/test/cryfs-cli/program_options/ParserTest.cpp @@ -1,5 +1,5 @@ #include "testutils/ProgramOptionsTestBase.h" -#include +#include #include using namespace cryfs; diff --git a/test/cryfs/cli/program_options/ProgramOptionsTest.cpp b/test/cryfs-cli/program_options/ProgramOptionsTest.cpp similarity index 98% rename from test/cryfs/cli/program_options/ProgramOptionsTest.cpp rename to test/cryfs-cli/program_options/ProgramOptionsTest.cpp index 17ed1bb8..d3cba542 100644 --- a/test/cryfs/cli/program_options/ProgramOptionsTest.cpp +++ b/test/cryfs-cli/program_options/ProgramOptionsTest.cpp @@ -1,5 +1,5 @@ #include "testutils/ProgramOptionsTestBase.h" -#include +#include #include using namespace cryfs::program_options; diff --git a/test/cryfs/cli/program_options/UtilsTest.cpp b/test/cryfs-cli/program_options/UtilsTest.cpp similarity index 99% rename from test/cryfs/cli/program_options/UtilsTest.cpp rename to test/cryfs-cli/program_options/UtilsTest.cpp index 811e92d0..7bb4ef96 100644 --- a/test/cryfs/cli/program_options/UtilsTest.cpp +++ b/test/cryfs-cli/program_options/UtilsTest.cpp @@ -1,5 +1,5 @@ #include "testutils/ProgramOptionsTestBase.h" -#include +#include using namespace cryfs::program_options; using std::pair; diff --git a/test/cryfs/cli/program_options/testutils/ProgramOptionsTestBase.h b/test/cryfs-cli/program_options/testutils/ProgramOptionsTestBase.h similarity index 100% rename from test/cryfs/cli/program_options/testutils/ProgramOptionsTestBase.h rename to test/cryfs-cli/program_options/testutils/ProgramOptionsTestBase.h diff --git a/test/cryfs/cli/testutils/CliTest.cpp b/test/cryfs-cli/testutils/CliTest.cpp similarity index 100% rename from test/cryfs/cli/testutils/CliTest.cpp rename to test/cryfs-cli/testutils/CliTest.cpp diff --git a/test/cryfs/cli/testutils/CliTest.h b/test/cryfs-cli/testutils/CliTest.h similarity index 96% rename from test/cryfs/cli/testutils/CliTest.h rename to test/cryfs-cli/testutils/CliTest.h index 85a3ee49..756eef0c 100644 --- a/test/cryfs/cli/testutils/CliTest.h +++ b/test/cryfs-cli/testutils/CliTest.h @@ -6,12 +6,12 @@ #include #include #include -#include -#include +#include +#include #include #include #include -#include "../../testutils/MockConsole.h" +#include "../../cryfs/testutils/MockConsole.h" class CliTest : public ::testing::Test { public: diff --git a/test/cryfs/CMakeLists.txt b/test/cryfs/CMakeLists.txt index a775ed05..514ba306 100644 --- a/test/cryfs/CMakeLists.txt +++ b/test/cryfs/CMakeLists.txt @@ -1,17 +1,6 @@ project (cryfs-test) set(SOURCES - cli/CallAfterTimeoutTest.cpp - cli/testutils/CliTest.cpp - cli/CliTest_Setup.cpp - cli/CliTest_WrongEnvironment.cpp - cli/program_options/UtilsTest.cpp - cli/program_options/ProgramOptionsTest.cpp - cli/program_options/ParserTest.cpp - cli/CliTest_ShowingHelp.cpp - cli/EnvironmentTest.cpp - cli/VersionCheckerTest.cpp - cli/VersionCompareTest.cpp config/crypto/CryConfigEncryptorFactoryTest.cpp config/crypto/outer/OuterConfigTest.cpp config/crypto/outer/OuterEncryptorTest.cpp @@ -30,7 +19,7 @@ set(SOURCES ) add_executable(${PROJECT_NAME} ${SOURCES}) -target_link_libraries(${PROJECT_NAME} googletest cryfs_lib) +target_link_libraries(${PROJECT_NAME} googletest cryfs) add_test(${PROJECT_NAME} ${PROJECT_NAME}) target_enable_style_warnings(${PROJECT_NAME}) diff --git a/test/cryfs/config/CryConfigFileTest.cpp b/test/cryfs/config/CryConfigFileTest.cpp index 66891053..cbb62d52 100644 --- a/test/cryfs/config/CryConfigFileTest.cpp +++ b/test/cryfs/config/CryConfigFileTest.cpp @@ -1,5 +1,4 @@ #include - #include #include diff --git a/test/cryfs/config/CryConfigTest.cpp b/test/cryfs/config/CryConfigTest.cpp index 89977ee7..41a12337 100644 --- a/test/cryfs/config/CryConfigTest.cpp +++ b/test/cryfs/config/CryConfigTest.cpp @@ -1,5 +1,4 @@ #include - #include using namespace cryfs;