From 538a6b10fdc14803ee904c8412e252704ef42952 Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Sat, 15 Jul 2023 12:17:44 +0200 Subject: [PATCH] speedup tests, fix includes --- src/change_detectors/CMakeLists.txt | 2 +- .../includes/ComparableFile.h | 4 +- src/change_detectors/srcs/ChangeDetector.cpp | 2 +- .../srcs/ChangeDetectorContainer.cpp | 2 +- .../srcs/ChangeDetectorFactory.cpp | 10 +- src/change_detectors/srcs/ComparableFile.cpp | 6 +- .../srcs/ContentsChangeDetector.cpp | 2 +- .../srcs/EditTimeChangeDetector.cpp | 2 +- .../srcs/SizeChangeDetector.cpp | 2 +- .../srcs/TypeChangeDetector.cpp | 2 +- src/chunkers/includes/ChunkerFactory.h | 2 +- src/chunkers/srcs/Buzhash.cpp | 2 +- src/chunkers/srcs/BuzhashChunker.cpp | 6 +- src/chunkers/srcs/Chunker.cpp | 4 +- src/chunkers/srcs/ChunkerFactory.cpp | 8 +- src/chunkers/srcs/ConstChunker.cpp | 6 +- src/commands/includes/CommandRestore.h | 2 +- src/commands/includes/Context.h | 6 +- src/commands/includes/Diff.h | 2 +- src/commands/srcs/CommandDiff.cpp | 26 ++--- src/commands/srcs/CommandList.cpp | 2 +- src/commands/srcs/CommandListFiles.cpp | 12 +-- src/commands/srcs/CommandMount.cpp | 2 +- src/commands/srcs/CommandRestore.cpp | 22 ++-- src/commands/srcs/CommandRun.cpp | 30 +++--- src/commands/srcs/CommandsCommon.cpp | 6 +- src/commands/srcs/Diff.cpp | 10 +- src/crypto/srcs/AES.cpp | 4 +- src/crypto/srcs/CRC32.cpp | 2 +- src/crypto/srcs/SHA.cpp | 4 +- src/filters/includes/FilterFactory.h | 2 +- src/filters/srcs/CheckFilter.cpp | 6 +- src/filters/srcs/Filter.cpp | 2 +- src/filters/srcs/FilterAES.cpp | 4 +- src/filters/srcs/FilterContainer.cpp | 2 +- src/filters/srcs/FilterFactory.cpp | 14 +-- src/filters/srcs/FilterShift.cpp | 2 +- src/filters/srcs/FilterShiftSecret.cpp | 2 +- src/filters/srcs/FilterZlib.cpp | 4 +- src/fuse/srcs/RepoFS.cpp | 2 +- src/main.cpp | 34 +++--- src/repo/includes/Repository.h | 4 +- src/repo/srcs/FileRepository.cpp | 10 +- src/repo/srcs/Object.cpp | 4 +- src/repo/srcs/Repository.cpp | 2 +- src/repo/srcs/objects/Archive.cpp | 6 +- src/repo/srcs/objects/Chunk.cpp | 6 +- src/repo/srcs/objects/File.cpp | 6 +- src/repo/srcs/objects/FileBuffer.cpp | 4 +- src/{repo => utils}/includes/Serialize.h | 2 +- src/utils/srcs/BytesFormatter.cpp | 2 +- src/utils/srcs/Config.cpp | 6 +- src/utils/srcs/Exception.cpp | 2 +- src/utils/srcs/Logger.cpp | 2 +- src/utils/srcs/Progress.cpp | 2 +- src/utils/srcs/RunningAverage.cpp | 2 +- src/utils/srcs/RunningDiffAverage.cpp | 2 +- src/utils/srcs/Signals.cpp | 2 +- src/utils/srcs/ThreadPool.cpp | 4 +- tests/clitests/scripts/backup.sh | 101 +----------------- tests/utils/srcs/Cleaner.cpp | 2 +- 61 files changed, 172 insertions(+), 265 deletions(-) rename src/{repo => utils}/includes/Serialize.h (99%) diff --git a/src/change_detectors/CMakeLists.txt b/src/change_detectors/CMakeLists.txt index 4f28004..5eeb093 100644 --- a/src/change_detectors/CMakeLists.txt +++ b/src/change_detectors/CMakeLists.txt @@ -4,4 +4,4 @@ add_library(change_detectors srcs/ChangeDetector.cpp srcs/ChangeDetectorContaine target_include_directories(change_detectors PUBLIC includes) -target_link_libraries(change_detectors utils) +target_link_libraries(change_detectors utils repo) diff --git a/src/change_detectors/includes/ComparableFile.h b/src/change_detectors/includes/ComparableFile.h index 4282046..a3abb20 100644 --- a/src/change_detectors/includes/ComparableFile.h +++ b/src/change_detectors/includes/ComparableFile.h @@ -9,8 +9,8 @@ #include #include -#include "../../repo/includes/Repository.h" -#include "../../repo/includes/objects/File.h" +#include "Repository.h" +#include "objects/File.h" /// Helper class to allow comparing files from different sources /** diff --git a/src/change_detectors/srcs/ChangeDetector.cpp b/src/change_detectors/srcs/ChangeDetector.cpp index 1a7c8c1..1c7cb2d 100644 --- a/src/change_detectors/srcs/ChangeDetector.cpp +++ b/src/change_detectors/srcs/ChangeDetector.cpp @@ -2,6 +2,6 @@ // Created by Stepan Usatiuk on 16.04.2023. // -#include "../includes/ChangeDetector.h" +#include "ChangeDetector.h" ChangeDetector::~ChangeDetector() = default; diff --git a/src/change_detectors/srcs/ChangeDetectorContainer.cpp b/src/change_detectors/srcs/ChangeDetectorContainer.cpp index 760f441..8853456 100644 --- a/src/change_detectors/srcs/ChangeDetectorContainer.cpp +++ b/src/change_detectors/srcs/ChangeDetectorContainer.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 04.05.2023. // -#include "../includes/ChangeDetectorContainer.h" +#include "ChangeDetectorContainer.h" #include diff --git a/src/change_detectors/srcs/ChangeDetectorFactory.cpp b/src/change_detectors/srcs/ChangeDetectorFactory.cpp index e1e1b04..ffb2a97 100644 --- a/src/change_detectors/srcs/ChangeDetectorFactory.cpp +++ b/src/change_detectors/srcs/ChangeDetectorFactory.cpp @@ -2,15 +2,15 @@ // Created by Stepan Usatiuk on 16.04.2023. // -#include "../includes/ChangeDetectorFactory.h" +#include "ChangeDetectorFactory.h" #include -#include "../includes/ContentsChangeDetector.h" -#include "../includes/EditTimeChangeDetector.h" -#include "../includes/SizeChangeDetector.h" -#include "../includes/TypeChangeDetector.h" +#include "ContentsChangeDetector.h" +#include "EditTimeChangeDetector.h" #include "Exception.h" +#include "SizeChangeDetector.h" +#include "TypeChangeDetector.h" std::unique_ptr ChangeDetectorFactory::getChangeDetector(const std::string &type) { if (type == "etime") { diff --git a/src/change_detectors/srcs/ComparableFile.cpp b/src/change_detectors/srcs/ComparableFile.cpp index dbb899c..77a1483 100644 --- a/src/change_detectors/srcs/ComparableFile.cpp +++ b/src/change_detectors/srcs/ComparableFile.cpp @@ -3,13 +3,13 @@ // -#include "../includes/ComparableFile.h" +#include "ComparableFile.h" #include #include -#include "../../repo/includes/objects/FileBuffer.h" -#include "../../utils/includes/Exception.h" +#include "Exception.h" +#include "objects/FileBuffer.h" ComparableFile::ComparableFile(const File &file, const Repository *repo) : path(file.name), diff --git a/src/change_detectors/srcs/ContentsChangeDetector.cpp b/src/change_detectors/srcs/ContentsChangeDetector.cpp index a6987b2..3749c47 100644 --- a/src/change_detectors/srcs/ContentsChangeDetector.cpp +++ b/src/change_detectors/srcs/ContentsChangeDetector.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 05.05.2023. // -#include "../includes/ContentsChangeDetector.h" +#include "ContentsChangeDetector.h" #include diff --git a/src/change_detectors/srcs/EditTimeChangeDetector.cpp b/src/change_detectors/srcs/EditTimeChangeDetector.cpp index b880dfc..d0716af 100644 --- a/src/change_detectors/srcs/EditTimeChangeDetector.cpp +++ b/src/change_detectors/srcs/EditTimeChangeDetector.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 16.04.2023. // -#include "../includes/EditTimeChangeDetector.h" +#include "EditTimeChangeDetector.h" bool EditTimeChangeDetector::check(const ComparableFile &f1, const ComparableFile &f2) const { return f1.mtime != f2.mtime; diff --git a/src/change_detectors/srcs/SizeChangeDetector.cpp b/src/change_detectors/srcs/SizeChangeDetector.cpp index 591030e..5cd0fb5 100644 --- a/src/change_detectors/srcs/SizeChangeDetector.cpp +++ b/src/change_detectors/srcs/SizeChangeDetector.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 16.04.2023. // -#include "../includes/SizeChangeDetector.h" +#include "SizeChangeDetector.h" bool SizeChangeDetector::check(const ComparableFile &f1, const ComparableFile &f2) const { return f1.bytes != f2.bytes; diff --git a/src/change_detectors/srcs/TypeChangeDetector.cpp b/src/change_detectors/srcs/TypeChangeDetector.cpp index 4b9bc51..3ef9d3a 100644 --- a/src/change_detectors/srcs/TypeChangeDetector.cpp +++ b/src/change_detectors/srcs/TypeChangeDetector.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 12.05.2023. // -#include "../includes/TypeChangeDetector.h" +#include "TypeChangeDetector.h" bool TypeChangeDetector::check(const ComparableFile &f1, const ComparableFile &f2) const { return f1.type != f2.type; diff --git a/src/chunkers/includes/ChunkerFactory.h b/src/chunkers/includes/ChunkerFactory.h index 8e51929..8e784eb 100644 --- a/src/chunkers/includes/ChunkerFactory.h +++ b/src/chunkers/includes/ChunkerFactory.h @@ -8,8 +8,8 @@ #include #include -#include "../../utils/includes/Config.h" #include "Chunker.h" +#include "Config.h" /// Factory for Chunker%s class ChunkerFactory { diff --git a/src/chunkers/srcs/Buzhash.cpp b/src/chunkers/srcs/Buzhash.cpp index e83cc27..cb95bad 100644 --- a/src/chunkers/srcs/Buzhash.cpp +++ b/src/chunkers/srcs/Buzhash.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 26.04.2023. // -#include "../includes/Buzhash.h" +#include "Buzhash.h" Buzhash::Buzhash(uint32_t blockSize) : blockSize(blockSize), history() {} diff --git a/src/chunkers/srcs/BuzhashChunker.cpp b/src/chunkers/srcs/BuzhashChunker.cpp index 84b8af5..ac6bb3b 100644 --- a/src/chunkers/srcs/BuzhashChunker.cpp +++ b/src/chunkers/srcs/BuzhashChunker.cpp @@ -2,10 +2,10 @@ // Created by Stepan Usatiuk on 26.04.2023. // -#include "../includes/BuzhashChunker.h" +#include "BuzhashChunker.h" -#include "../../crypto/includes/SHA.h" -#include "../../utils/includes/Exception.h" +#include "Exception.h" +#include "SHA.h" BuzhashChunker::BuzhashChunker(std::streambuf *buf, unsigned long long minBytes, unsigned long long maxBytes, unsigned long long mask, uint32_t window) : Chunker(buf, maxBytes), window(window), minBytes(minBytes), mask(mask), buzhash(window) {} diff --git a/src/chunkers/srcs/Chunker.cpp b/src/chunkers/srcs/Chunker.cpp index cff255f..e581ecc 100644 --- a/src/chunkers/srcs/Chunker.cpp +++ b/src/chunkers/srcs/Chunker.cpp @@ -2,9 +2,9 @@ // Created by Stepan Usatiuk on 15.04.2023. // -#include "../includes/Chunker.h" +#include "Chunker.h" -#include "../../utils/includes/Exception.h" +#include "Exception.h" Chunker::Chunker(std::streambuf *buf, unsigned long long maxBytes) : buf(buf), maxBytes(maxBytes) {} diff --git a/src/chunkers/srcs/ChunkerFactory.cpp b/src/chunkers/srcs/ChunkerFactory.cpp index ac4b854..dc199cb 100644 --- a/src/chunkers/srcs/ChunkerFactory.cpp +++ b/src/chunkers/srcs/ChunkerFactory.cpp @@ -2,11 +2,11 @@ // Created by Stepan Usatiuk on 30.04.2023. // -#include "../includes/ChunkerFactory.h" +#include "ChunkerFactory.h" -#include "../../utils/includes/Exception.h" -#include "../includes/BuzhashChunker.h" -#include "../includes/ConstChunker.h" +#include "BuzhashChunker.h" +#include "ConstChunker.h" +#include "Exception.h" std::unique_ptr ChunkerFactory::getChunker(const Config &config, std::streambuf *buf) { if (config.getStr("chunker") == "const") { diff --git a/src/chunkers/srcs/ConstChunker.cpp b/src/chunkers/srcs/ConstChunker.cpp index bcfa515..3f3827c 100644 --- a/src/chunkers/srcs/ConstChunker.cpp +++ b/src/chunkers/srcs/ConstChunker.cpp @@ -2,10 +2,10 @@ // Created by Stepan Usatiuk on 15.04.2023. // -#include "../includes/ConstChunker.h" +#include "ConstChunker.h" -#include "../../crypto/includes/SHA.h" -#include "../../utils/includes/Exception.h" +#include "Exception.h" +#include "SHA.h" ConstChunker::ConstChunker(std::streambuf *buf, unsigned long long maxBytes) : Chunker(buf, maxBytes) {} diff --git a/src/commands/includes/CommandRestore.h b/src/commands/includes/CommandRestore.h index f6a7056..41c38df 100644 --- a/src/commands/includes/CommandRestore.h +++ b/src/commands/includes/CommandRestore.h @@ -7,7 +7,7 @@ #include "Command.h" -#include "../../repo/includes/objects/File.h" +#include "objects/File.h" #include "CommandsCommon.h" diff --git a/src/commands/includes/Context.h b/src/commands/includes/Context.h index 50f1ebb..3f27063 100644 --- a/src/commands/includes/Context.h +++ b/src/commands/includes/Context.h @@ -5,9 +5,9 @@ #ifndef SEMBACKUP_CONTEXT_H #define SEMBACKUP_CONTEXT_H -#include "../../repo/includes/Repository.h" -#include "../../utils/includes/Config.h" -#include "../../utils/includes/Logger.h" +#include "Config.h" +#include "Logger.h" +#include "Repository.h" struct Context { Logger *logger; diff --git a/src/commands/includes/Diff.h b/src/commands/includes/Diff.h index e5a9c33..111ab2b 100644 --- a/src/commands/includes/Diff.h +++ b/src/commands/includes/Diff.h @@ -8,7 +8,7 @@ #include #include -#include "../../change_detectors/includes/ComparableFile.h" +#include "ComparableFile.h" /// Utility class to compute difference between two ComparableFile%s class Diff { diff --git a/src/commands/srcs/CommandDiff.cpp b/src/commands/srcs/CommandDiff.cpp index c9c51db..ee040b7 100644 --- a/src/commands/srcs/CommandDiff.cpp +++ b/src/commands/srcs/CommandDiff.cpp @@ -2,20 +2,20 @@ // Created by Stepan Usatiuk on 23.05.2023. // -#include "../includes/CommandDiff.h" +#include "CommandDiff.h" -#include "../../change_detectors/includes/ChangeDetectorFactory.h" -#include "../../chunkers/includes/ChunkerFactory.h" -#include "../../repo/includes/Serialize.h" -#include "../../repo/includes/objects/Archive.h" -#include "../../repo/includes/objects/Chunk.h" -#include "../../utils/includes/BytesFormatter.h" -#include "../../utils/includes/Exception.h" -#include "../../utils/includes/Progress.h" -#include "../../utils/includes/RunningDiffAverage.h" -#include "../../utils/includes/Signals.h" -#include "../../utils/includes/ThreadPool.h" -#include "../includes/Diff.h" +#include "BytesFormatter.h" +#include "ChangeDetectorFactory.h" +#include "ChunkerFactory.h" +#include "Diff.h" +#include "Exception.h" +#include "Progress.h" +#include "RunningDiffAverage.h" +#include "Serialize.h" +#include "Signals.h" +#include "ThreadPool.h" +#include "objects/Archive.h" +#include "objects/Chunk.h" using namespace CommandsCommon; diff --git a/src/commands/srcs/CommandList.cpp b/src/commands/srcs/CommandList.cpp index 9cb29ca..df3bf71 100644 --- a/src/commands/srcs/CommandList.cpp +++ b/src/commands/srcs/CommandList.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 23.05.2023. // -#include "../includes/CommandList.h" +#include "CommandList.h" CommandList::CommandList() : Command() { } diff --git a/src/commands/srcs/CommandListFiles.cpp b/src/commands/srcs/CommandListFiles.cpp index 2fb77de..0491b35 100644 --- a/src/commands/srcs/CommandListFiles.cpp +++ b/src/commands/srcs/CommandListFiles.cpp @@ -2,13 +2,13 @@ // Created by Stepan Usatiuk on 23.05.2023. // -#include "../includes/CommandListFiles.h" +#include "CommandListFiles.h" -#include "../../repo/includes/Serialize.h" -#include "../../repo/includes/objects/Archive.h" -#include "../../repo/includes/objects/Chunk.h" -#include "../../repo/includes/objects/File.h" -#include "../../utils/includes/BytesFormatter.h" +#include "BytesFormatter.h" +#include "Serialize.h" +#include "objects/Archive.h" +#include "objects/Chunk.h" +#include "objects/File.h" CommandListFiles::CommandListFiles() : Command() { } diff --git a/src/commands/srcs/CommandMount.cpp b/src/commands/srcs/CommandMount.cpp index 2d21c95..efefe23 100644 --- a/src/commands/srcs/CommandMount.cpp +++ b/src/commands/srcs/CommandMount.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 07.06.2023. // -#include "../includes/CommandMount.h" +#include "CommandMount.h" #include "RepoFS.h" CommandMount::CommandMount() : Command() { diff --git a/src/commands/srcs/CommandRestore.cpp b/src/commands/srcs/CommandRestore.cpp index 9541455..cbbe8d2 100644 --- a/src/commands/srcs/CommandRestore.cpp +++ b/src/commands/srcs/CommandRestore.cpp @@ -2,21 +2,21 @@ // Created by Stepan Usatiuk on 23.05.2023. // -#include "../includes/CommandRestore.h" +#include "CommandRestore.h" #include #include -#include "../../chunkers/includes/ChunkerFactory.h" -#include "../../repo/includes/Serialize.h" -#include "../../repo/includes/objects/Archive.h" -#include "../../repo/includes/objects/Chunk.h" -#include "../../utils/includes/BytesFormatter.h" -#include "../../utils/includes/Exception.h" -#include "../../utils/includes/Progress.h" -#include "../../utils/includes/RunningDiffAverage.h" -#include "../../utils/includes/Signals.h" -#include "../../utils/includes/ThreadPool.h" +#include "BytesFormatter.h" +#include "ChunkerFactory.h" +#include "Exception.h" +#include "Progress.h" +#include "RunningDiffAverage.h" +#include "Serialize.h" +#include "Signals.h" +#include "ThreadPool.h" +#include "objects/Archive.h" +#include "objects/Chunk.h" using namespace CommandsCommon; diff --git a/src/commands/srcs/CommandRun.cpp b/src/commands/srcs/CommandRun.cpp index 25ae23b..7e927af 100644 --- a/src/commands/srcs/CommandRun.cpp +++ b/src/commands/srcs/CommandRun.cpp @@ -2,27 +2,27 @@ // Created by Stepan Usatiuk on 23.05.2023. // -#include "../includes/CommandRun.h" +#include "CommandRun.h" #include #include #include -#include "../../change_detectors/includes/ChangeDetectorFactory.h" -#include "../../chunkers/includes/ChunkerFactory.h" -#include "../../crypto/includes/SHA.h" -#include "../../repo/includes/Serialize.h" -#include "../../repo/includes/objects/Archive.h" -#include "../../repo/includes/objects/Chunk.h" -#include "../../repo/includes/objects/File.h" -#include "../../utils/includes/BytesFormatter.h" -#include "../../utils/includes/Exception.h" -#include "../../utils/includes/Progress.h" -#include "../../utils/includes/RunningDiffAverage.h" -#include "../../utils/includes/Signals.h" -#include "../../utils/includes/ThreadPool.h" +#include "BytesFormatter.h" +#include "ChangeDetectorFactory.h" +#include "ChunkerFactory.h" +#include "Exception.h" +#include "Progress.h" +#include "RunningDiffAverage.h" +#include "SHA.h" +#include "Serialize.h" +#include "Signals.h" +#include "ThreadPool.h" +#include "objects/Archive.h" +#include "objects/Chunk.h" +#include "objects/File.h" -#include "../includes/CommandsCommon.h" +#include "CommandsCommon.h" using namespace CommandsCommon; diff --git a/src/commands/srcs/CommandsCommon.cpp b/src/commands/srcs/CommandsCommon.cpp index af7b61d..ea0abf4 100644 --- a/src/commands/srcs/CommandsCommon.cpp +++ b/src/commands/srcs/CommandsCommon.cpp @@ -2,13 +2,13 @@ // Created by Stepan Usatiuk on 23.05.2023. // -#include "../includes/CommandsCommon.h" +#include "CommandsCommon.h" #include #include -#include "../../utils/includes/Exception.h" -#include "../../utils/includes/Signals.h" +#include "Exception.h" +#include "Signals.h" void CommandsCommon::workerCallback(unsigned long long int bytesWritten, unsigned long long int bytesSkipped, unsigned long long int filesWritten, WorkerStats &to) { to.bytesWritten += bytesWritten; diff --git a/src/commands/srcs/Diff.cpp b/src/commands/srcs/Diff.cpp index 3da909c..a9a19c1 100644 --- a/src/commands/srcs/Diff.cpp +++ b/src/commands/srcs/Diff.cpp @@ -2,12 +2,12 @@ // Created by Stepan Usatiuk on 06.05.2023. // -#include "../includes/Diff.h" +#include "Diff.h" -#include "../../chunkers/includes/BuzhashChunker.h" -#include "../../utils/includes/BytesFormatter.h" -#include "../../utils/includes/Exception.h" -#include "../../utils/includes/Signals.h" +#include "BuzhashChunker.h" +#include "BytesFormatter.h" +#include "Exception.h" +#include "Signals.h" bool Diff::isBinary(const ComparableFile &c) { auto b = c.contents(); diff --git a/src/crypto/srcs/AES.cpp b/src/crypto/srcs/AES.cpp index d691bd6..5de64b4 100644 --- a/src/crypto/srcs/AES.cpp +++ b/src/crypto/srcs/AES.cpp @@ -2,13 +2,13 @@ // Created by Stepan Usatiuk on 30.04.2023. // -#include "../includes/AES.h" +#include "AES.h" #include #include #include -#include "../../utils/includes/Exception.h" +#include "Exception.h" std::vector AES::encrypt(const std::vector &in, const std::string &password, const std::string &salt) { return AES::encrypt(in, AES::deriveKey(password, salt)); diff --git a/src/crypto/srcs/CRC32.cpp b/src/crypto/srcs/CRC32.cpp index a9838bd..d25a85b 100644 --- a/src/crypto/srcs/CRC32.cpp +++ b/src/crypto/srcs/CRC32.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 12.05.2023. // -#include "../includes/CRC32.h" +#include "CRC32.h" CRC32::crcType CRC32::calculate(const std::vector &in) { crcType res = crc32(0L, nullptr, 0); diff --git a/src/crypto/srcs/SHA.cpp b/src/crypto/srcs/SHA.cpp index bd7743c..0de1266 100644 --- a/src/crypto/srcs/SHA.cpp +++ b/src/crypto/srcs/SHA.cpp @@ -2,9 +2,9 @@ // Created by Stepan Usatiuk on 15.04.2023. // -#include "../includes/SHA.h" +#include "SHA.h" -#include "../../utils/includes/Exception.h" +#include "Exception.h" std::string SHA::calculate(const std::vector &in) { SHA hasher; diff --git a/src/filters/includes/FilterFactory.h b/src/filters/includes/FilterFactory.h index e848c78..eb575ef 100644 --- a/src/filters/includes/FilterFactory.h +++ b/src/filters/includes/FilterFactory.h @@ -8,7 +8,7 @@ #include #include -#include "../../utils/includes/Config.h" +#include "Config.h" #include "Filter.h" /// Utility factory class for Filter%s diff --git a/src/filters/srcs/CheckFilter.cpp b/src/filters/srcs/CheckFilter.cpp index abb0f59..e34e28b 100644 --- a/src/filters/srcs/CheckFilter.cpp +++ b/src/filters/srcs/CheckFilter.cpp @@ -2,9 +2,9 @@ // Created by Stepan Usatiuk on 12.05.2023. // -#include "../includes/CheckFilter.h" -#include "../../crypto/includes/CRC32.h" -#include "../../repo/includes/Serialize.h" +#include "CheckFilter.h" +#include "CRC32.h" +#include "Serialize.h" std::vector CheckFilter::filterWrite(std::vector from) const { return filterWriteStatic(std::move(from)); diff --git a/src/filters/srcs/Filter.cpp b/src/filters/srcs/Filter.cpp index 97f5ee2..d2f5d64 100644 --- a/src/filters/srcs/Filter.cpp +++ b/src/filters/srcs/Filter.cpp @@ -2,5 +2,5 @@ // Created by Stepan Usatiuk on 22.04.2023. // -#include "../includes/Filter.h" +#include "Filter.h" Filter::~Filter() = default; \ No newline at end of file diff --git a/src/filters/srcs/FilterAES.cpp b/src/filters/srcs/FilterAES.cpp index 73b7cf7..0ff401d 100644 --- a/src/filters/srcs/FilterAES.cpp +++ b/src/filters/srcs/FilterAES.cpp @@ -2,9 +2,9 @@ // Created by Stepan Usatiuk on 23.04.2023. // -#include "../includes/FilterAES.h" +#include "FilterAES.h" -#include "../../crypto/includes/AES.h" +#include "AES.h" std::vector FilterAES::filterWrite(std::vector from) const { return AES::encrypt(from, key); diff --git a/src/filters/srcs/FilterContainer.cpp b/src/filters/srcs/FilterContainer.cpp index cf0d4d6..cc3cb63 100644 --- a/src/filters/srcs/FilterContainer.cpp +++ b/src/filters/srcs/FilterContainer.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 22.04.2023. // -#include "../includes/FilterContainer.h" +#include "FilterContainer.h" FilterContainer::FilterContainer() = default; diff --git a/src/filters/srcs/FilterFactory.cpp b/src/filters/srcs/FilterFactory.cpp index c41f26d..cd37de5 100644 --- a/src/filters/srcs/FilterFactory.cpp +++ b/src/filters/srcs/FilterFactory.cpp @@ -2,14 +2,14 @@ // Created by Stepan Usatiuk on 22.04.2023. // -#include "../includes/FilterFactory.h" +#include "FilterFactory.h" -#include "../../utils/includes/Exception.h" -#include "../includes/CheckFilter.h" -#include "../includes/FilterAES.h" -#include "../includes/FilterShift.h" -#include "../includes/FilterShiftSecret.h" -#include "../includes/FilterZlib.h" +#include "CheckFilter.h" +#include "Exception.h" +#include "FilterAES.h" +#include "FilterShift.h" +#include "FilterShiftSecret.h" +#include "FilterZlib.h" std::unique_ptr FilterFactory::makeFilter(const std::string &type, const Config &config) { if (type == "none") throw Exception("Trying to make a \"none\" filter!"); diff --git a/src/filters/srcs/FilterShift.cpp b/src/filters/srcs/FilterShift.cpp index 14f9e7c..0ff40ee 100644 --- a/src/filters/srcs/FilterShift.cpp +++ b/src/filters/srcs/FilterShift.cpp @@ -1,7 +1,7 @@ // // Created by Stepan Usatiuk on 22.04.2023. // -#include "../includes/FilterShift.h" +#include "FilterShift.h" std::vector FilterShift::filterWrite(std::vector from) const { for (auto &c: from) c += shiftVal; diff --git a/src/filters/srcs/FilterShiftSecret.cpp b/src/filters/srcs/FilterShiftSecret.cpp index 2bd7c21..58184b1 100644 --- a/src/filters/srcs/FilterShiftSecret.cpp +++ b/src/filters/srcs/FilterShiftSecret.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 23.04.2023. // -#include "../includes/FilterShiftSecret.h" +#include "FilterShiftSecret.h" #include diff --git a/src/filters/srcs/FilterZlib.cpp b/src/filters/srcs/FilterZlib.cpp index 482f866..b203e9e 100644 --- a/src/filters/srcs/FilterZlib.cpp +++ b/src/filters/srcs/FilterZlib.cpp @@ -2,11 +2,11 @@ // Created by Stepan Usatiuk on 23.04.2023. // -#include "../includes/FilterZlib.h" +#include "FilterZlib.h" #include -#include "../../repo/includes/Serialize.h" +#include "Serialize.h" std::vector FilterZlib::filterWrite(std::vector from) const { uLongf outSize = compressBound(from.size()); diff --git a/src/fuse/srcs/RepoFS.cpp b/src/fuse/srcs/RepoFS.cpp index 857b887..8ed8c29 100644 --- a/src/fuse/srcs/RepoFS.cpp +++ b/src/fuse/srcs/RepoFS.cpp @@ -3,7 +3,7 @@ // -#include "../includes/RepoFS.h" +#include "RepoFS.h" #include #include diff --git a/src/main.cpp b/src/main.cpp index b14a144..235d3dd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,24 +1,24 @@ #include +#include "BytesFormatter.h" +#include "Command.h" +#include "CommandDiff.h" +#include "CommandList.h" +#include "CommandListFiles.h" #include "CommandMount.h" -#include "commands/includes/Command.h" -#include "commands/includes/CommandDiff.h" -#include "commands/includes/CommandList.h" -#include "commands/includes/CommandListFiles.h" -#include "commands/includes/CommandRestore.h" -#include "commands/includes/CommandRun.h" -#include "commands/includes/Context.h" -#include "repo/includes/FileRepository.h" -#include "repo/includes/Repository.h" -#include "repo/includes/Serialize.h" -#include "repo/includes/objects/Archive.h" -#include "repo/includes/objects/File.h" -#include "utils/includes/BytesFormatter.h" -#include "utils/includes/Config.h" -#include "utils/includes/Exception.h" -#include "utils/includes/Logger.h" -#include "utils/includes/Signals.h" +#include "CommandRestore.h" +#include "CommandRun.h" +#include "Config.h" +#include "Context.h" +#include "Exception.h" +#include "FileRepository.h" +#include "Logger.h" +#include "Repository.h" +#include "Serialize.h" +#include "Signals.h" +#include "objects/Archive.h" +#include "objects/File.h" Config getConf(int argc, char *argv[]) { Config out; diff --git a/src/repo/includes/Repository.h b/src/repo/includes/Repository.h index 17175d5..6b0f0d1 100644 --- a/src/repo/includes/Repository.h +++ b/src/repo/includes/Repository.h @@ -9,8 +9,8 @@ #include #include -#include "../../filters/includes/FilterContainer.h" -#include "../../utils/includes/Config.h" +#include "Config.h" +#include "FilterContainer.h" #include "Object.h" /// Abstract base class for an Object Repository diff --git a/src/repo/srcs/FileRepository.cpp b/src/repo/srcs/FileRepository.cpp index 01c6cc5..02596b1 100644 --- a/src/repo/srcs/FileRepository.cpp +++ b/src/repo/srcs/FileRepository.cpp @@ -2,16 +2,16 @@ // Created by Stepan Usatiuk on 14.04.2023. // -#include "../includes/FileRepository.h" +#include "FileRepository.h" #include #include #include -#include "../../filters/includes/CheckFilter.h" -#include "../../filters/includes/FilterFactory.h" -#include "../includes/Object.h" -#include "../includes/Serialize.h" +#include "CheckFilter.h" +#include "FilterFactory.h" +#include "Object.h" +#include "Serialize.h" FileRepository::FileRepository(Config config) : Repository(std::move(config)), root(std::filesystem::path(this->config.getStr("repo"))), writeCacheMax(config.getInt("repo-target") * 1024 * 1024) {} diff --git a/src/repo/srcs/Object.cpp b/src/repo/srcs/Object.cpp index a8fd7d7..3a7c488 100644 --- a/src/repo/srcs/Object.cpp +++ b/src/repo/srcs/Object.cpp @@ -2,9 +2,9 @@ // Created by Stepan Usatiuk on 14.04.2023. // -#include "../includes/Object.h" +#include "Object.h" -#include "../includes/Serialize.h" +#include "Serialize.h" Object::Object(idType id, ObjectType type) : id(id), type(type) {} diff --git a/src/repo/srcs/Repository.cpp b/src/repo/srcs/Repository.cpp index dcde2e1..22568f7 100644 --- a/src/repo/srcs/Repository.cpp +++ b/src/repo/srcs/Repository.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 14.04.2023. // -#include "../includes/Repository.h" +#include "Repository.h" Repository::~Repository() = default; Repository::Repository(Config config) : config(std::move(config)) {} diff --git a/src/repo/srcs/objects/Archive.cpp b/src/repo/srcs/objects/Archive.cpp index 97f50db..84bc164 100644 --- a/src/repo/srcs/objects/Archive.cpp +++ b/src/repo/srcs/objects/Archive.cpp @@ -2,10 +2,10 @@ // Created by Stepan Usatiuk on 14.04.2023. // -#include "../../includes/objects/Archive.h" +#include "objects/Archive.h" -#include "../../../utils/includes/Exception.h" -#include "../../includes/Serialize.h" +#include "Exception.h" +#include "Serialize.h" Archive::Archive(Object::idType id, std::string name, unsigned long long mtime, std::vector files) : Object(id, ObjectType::Archive), name(name), mtime(mtime), files(files) {} diff --git a/src/repo/srcs/objects/Chunk.cpp b/src/repo/srcs/objects/Chunk.cpp index ff4ddcd..d4a58e4 100644 --- a/src/repo/srcs/objects/Chunk.cpp +++ b/src/repo/srcs/objects/Chunk.cpp @@ -2,10 +2,10 @@ // Created by Stepan Usatiuk on 14.04.2023. // -#include "../../includes/objects/Chunk.h" +#include "objects/Chunk.h" -#include "../../../utils/includes/Exception.h" -#include "../../includes/Serialize.h" +#include "Exception.h" +#include "Serialize.h" Chunk::Chunk(idType id, std::string SHA, std::vector data) : Object(id, ObjectType::Chunk), data(std::move(data)), SHA(std::move(SHA)), length(this->data.size()) {} diff --git a/src/repo/srcs/objects/File.cpp b/src/repo/srcs/objects/File.cpp index 4ec2313..5ef368b 100644 --- a/src/repo/srcs/objects/File.cpp +++ b/src/repo/srcs/objects/File.cpp @@ -2,14 +2,14 @@ // Created by Stepan Usatiuk on 14.04.2023. // -#include "../../includes/objects/File.h" +#include "objects/File.h" #include #include #include -#include "../../../utils/includes/Exception.h" -#include "../../includes/Serialize.h" +#include "Exception.h" +#include "Serialize.h" File::File(Object::idType id, std::string name, unsigned long long bytes, unsigned long long mtime, std::string SHA, std::map chunks, Type fileType) : Object(id, ObjectType::File), name(name), bytes(bytes), mtime(mtime), SHA(SHA), fileType(fileType), chunks(std::move(chunks)) {} diff --git a/src/repo/srcs/objects/FileBuffer.cpp b/src/repo/srcs/objects/FileBuffer.cpp index afde9b8..a1130b8 100644 --- a/src/repo/srcs/objects/FileBuffer.cpp +++ b/src/repo/srcs/objects/FileBuffer.cpp @@ -2,9 +2,9 @@ // Created by Stepan Usatiuk on 23.04.2023. // -#include "../../includes/objects/FileBuffer.h" +#include "objects/FileBuffer.h" -#include "../../includes/Serialize.h" +#include "Serialize.h" FileBuffer::FileBuffer(const Repository *repo, Object::idType fileId) : repo(repo), file(Serialize::deserialize(repo->getObject(fileId))), chunksQueue() { for (auto const &id: file.chunks) chunksQueue.emplace(id.second); diff --git a/src/repo/includes/Serialize.h b/src/utils/includes/Serialize.h similarity index 99% rename from src/repo/includes/Serialize.h rename to src/utils/includes/Serialize.h index 5208d70..b2e51ad 100644 --- a/src/repo/includes/Serialize.h +++ b/src/utils/includes/Serialize.h @@ -20,7 +20,7 @@ #include #endif -#include "../../utils/includes/Exception.h" +#include "Exception.h" /// Serialization library /** diff --git a/src/utils/srcs/BytesFormatter.cpp b/src/utils/srcs/BytesFormatter.cpp index 16e8eb9..8b96fcc 100644 --- a/src/utils/srcs/BytesFormatter.cpp +++ b/src/utils/srcs/BytesFormatter.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 13.05.2023. // -#include "../includes/BytesFormatter.h" +#include "BytesFormatter.h" #include #include diff --git a/src/utils/srcs/Config.cpp b/src/utils/srcs/Config.cpp index 0d58eb7..e7ce85a 100644 --- a/src/utils/srcs/Config.cpp +++ b/src/utils/srcs/Config.cpp @@ -2,9 +2,9 @@ // Created by Stepan Usatiuk on 01.05.2023. // -#include "../includes/Config.h" -#include "../../repo/includes/Serialize.h" -#include "../includes/Exception.h" +#include "Config.h" +#include "Exception.h" +#include "Serialize.h" #include Config &Config::add(const std::string &k, const std::string &v) { diff --git a/src/utils/srcs/Exception.cpp b/src/utils/srcs/Exception.cpp index 20a8700..46ae6e3 100644 --- a/src/utils/srcs/Exception.cpp +++ b/src/utils/srcs/Exception.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 01.05.2023. // -#include "../includes/Exception.h" +#include "Exception.h" #include #include diff --git a/src/utils/srcs/Logger.cpp b/src/utils/srcs/Logger.cpp index cb004d2..8b80120 100644 --- a/src/utils/srcs/Logger.cpp +++ b/src/utils/srcs/Logger.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 23.05.2023. // -#include "../includes/Logger.h" +#include "Logger.h" Logger::Logger(int level, std::ostream &out) : loglevel(level), out(out) { } diff --git a/src/utils/srcs/Progress.cpp b/src/utils/srcs/Progress.cpp index 2a9818a..b1aa4c9 100644 --- a/src/utils/srcs/Progress.cpp +++ b/src/utils/srcs/Progress.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 05.05.2023. // -#include "../includes/Progress.h" +#include "Progress.h" #include #include diff --git a/src/utils/srcs/RunningAverage.cpp b/src/utils/srcs/RunningAverage.cpp index 3259608..c7d8bb8 100644 --- a/src/utils/srcs/RunningAverage.cpp +++ b/src/utils/srcs/RunningAverage.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 05.05.2023. // -#include "../includes/RunningAverage.h" +#include "RunningAverage.h" RunningAverage::RunningAverage(std::function getFunc, int max, int ms) : getFunc(std::move(getFunc)), max(max), ms(ms), thread(&RunningAverage::loop, this) { diff --git a/src/utils/srcs/RunningDiffAverage.cpp b/src/utils/srcs/RunningDiffAverage.cpp index 28b1215..bb8ee8b 100644 --- a/src/utils/srcs/RunningDiffAverage.cpp +++ b/src/utils/srcs/RunningDiffAverage.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 12.05.2023. // -#include "../includes/RunningDiffAverage.h" +#include "RunningDiffAverage.h" RunningDiffAverage::RunningDiffAverage(std::function getFunc, int max, int ms) : runningAverage( diff --git a/src/utils/srcs/Signals.cpp b/src/utils/srcs/Signals.cpp index bec532b..907b61b 100644 --- a/src/utils/srcs/Signals.cpp +++ b/src/utils/srcs/Signals.cpp @@ -1,7 +1,7 @@ // // Created by Stepan Usatiuk on 16.04.2023. // -#include "../includes/Signals.h" +#include "Signals.h" void Signals::setup() { signal(SIGINT, handle); diff --git a/src/utils/srcs/ThreadPool.cpp b/src/utils/srcs/ThreadPool.cpp index 7bac4e9..fd96499 100644 --- a/src/utils/srcs/ThreadPool.cpp +++ b/src/utils/srcs/ThreadPool.cpp @@ -1,7 +1,7 @@ #include -#include "../includes/Signals.h" -#include "../includes/ThreadPool.h" +#include "Signals.h" +#include "ThreadPool.h" ThreadPool::ThreadPool(std::function onError, std::size_t workersNum) : onError(std::move(onError)) { for (int i = 0; i < workersNum; i++) threads.emplace_back(&ThreadPool::loop, this); diff --git a/tests/clitests/scripts/backup.sh b/tests/clitests/scripts/backup.sh index 0642ea0..f304576 100755 --- a/tests/clitests/scripts/backup.sh +++ b/tests/clitests/scripts/backup.sh @@ -1,10 +1,12 @@ #!/bin/bash -TESTSIZE=16 +TESTSIZE=4 # TODO: Don't hardcode this CMD="../../src/backup" +CHUNKEROPTS=" --chunker-min 64 --chunker-max 1024 --chunker-mask 17 --repo-target 2 " + TESTDATADIR=backup rm -rf "$TESTDATADIR" @@ -50,7 +52,7 @@ cat "$TESTDATADIR"/testdata/7/b >> "$TESTDATADIR"/testdata/8/b echo "Data created" -if ! $CMD init --repo "$TESTDATADIR"/testdir/to1 --compression zlib --compression-level 4 --encryption aes --password asdff --salt e; then +if ! $CMD init $CHUNKEROPTS --repo "$TESTDATADIR"/testdir/to1 --compression zlib --compression-level 4 --encryption aes --password asdff --salt e; then echo "Error creating repo!" exit 1 fi @@ -204,101 +206,6 @@ if ! ( ! ( echo "$OUT" | grep -q 'b is different' ) && ( echo "$OUT" | grep -q ' fi echo "OK comparing archive last and current" - -if ! $CMD init --repo "$TESTDATADIR"/testdir/to2 --compression zlib --compression-level 4 --encryption aes --password asdff --salt e; then - echo "Error creating repo!" - exit 1 -fi -echo "Repo created" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Copied: a' ) && ( echo "$OUT" | grep -q 'Copied: aa' ) && ( echo "$OUT" | grep -q 'Copied: b' ) && ( echo "$OUT" | grep -q 'Copied: c' ) ); then - echo "Error backing up 1 dir!" - exit 1 -fi -echo "Backup 1 ok" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) && ( echo "$OUT" | grep -q 'Skipped: c' )); then - echo "Error backing up 2 dir!" - exit 1 -fi -echo "Backup 2 ok" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) && ( echo "$OUT" | grep -q 'Skipped: c' ) ); then - echo "Error backing up 3 dir!" - exit 1 -fi -echo "Backup 3 ok" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) && ( echo "$OUT" | grep -q 'Skipped: c' )); then - echo "Error backing up 4 dir!" - exit 1 -fi -echo "Backup 4 ok" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) && ( echo "$OUT" | grep -q 'Skipped: c' ) ); then - echo "Error backing up 5 dir!" - exit 1 -fi -echo "Backup 5 ok" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) && ( echo "$OUT" | grep -q 'Skipped: c' ) ); then - echo "Error backing up 6 dir!" - exit 1 -fi -echo "Backup 6 ok" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) && ( echo "$OUT" | grep -q 'Skipped: c' ) ); then - echo "Error backing up 7 dir!" - exit 1 -fi -echo "Backup 7 ok" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) && ( echo "$OUT" | grep -q 'Skipped: c' )); then - echo "Error backing up 8 dir!" - exit 1 -fi -echo "Backup 8 ok" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) && ( echo "$OUT" | grep -q 'Skipped: c' ) ); then - echo "Error backing up 9 dir!" - exit 1 -fi -echo "Backup 9 ok" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) && ( echo "$OUT" | grep -q 'Skipped: c' ) ); then - echo "Error backing up 10 dir!" - exit 1 -fi -echo "Backup 10 ok" - -OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1) -echo "$OUT" -if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) && ( echo "$OUT" | grep -q 'Skipped: c' ) ); then - echo "Error backing up 11 dir!" - exit 1 -fi -echo "Backup 11 ok" - rm -rf "$TESTDATADIR" exit 0 \ No newline at end of file diff --git a/tests/utils/srcs/Cleaner.cpp b/tests/utils/srcs/Cleaner.cpp index dde3fb2..7cf730c 100644 --- a/tests/utils/srcs/Cleaner.cpp +++ b/tests/utils/srcs/Cleaner.cpp @@ -2,7 +2,7 @@ // Created by Stepan Usatiuk on 14.04.2023. // -#include "../includes/Cleaner.h" +#include "Cleaner.h" Cleaner::Cleaner(std::vector toClean) : toClean(std::move(toClean)) { for (const auto &p: this->toClean) {