Merge pull request #59 from anraf1001/schedule-exclude-dir

Exclude tests dir in clang-format check
coders-school · Jun 23, 2022 · 911bd2e · 911bd2e
2 parents 8fb2198 + 59d0fad
commit 911bd2e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml
@@ -29,3 +29,4 @@ jobs:
       uses: coders-school/github-actions/clang-format-check@main
       with:
         check_path: homework/schedule
+        exclude_dir: 'homework/schedule/tests/catch'
diff --git a/homework/schedule/CMakeLists.txt b/homework/schedule/CMakeLists.txt
@@ -8,8 +8,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 include_directories(.)
 
 add_executable(${PROJECT_NAME} main.cpp)
-add_executable(${PROJECT_NAME}-ut tests/catch_amalgamated.cpp tests/catch_main.cpp tests/tests.cpp)
-add_executable(${PROJECT_NAME}-ut-bonus tests/catch_amalgamated.cpp tests/catch_main.cpp tests/tests-bonus.cpp)
+add_executable(${PROJECT_NAME}-ut tests/catch/catch_amalgamated.cpp tests/catch/catch_main.cpp tests/tests.cpp)
+add_executable(${PROJECT_NAME}-ut-bonus tests/catch/catch_amalgamated.cpp tests/catch/catch_main.cpp tests/tests-bonus.cpp)
 
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror -Wpedantic)
 target_compile_options(${PROJECT_NAME}-ut PRIVATE -Wall -Wextra -Werror -Wpedantic)

diff --git a/...work/schedule/tests/catch_amalgamated.cpp → ...chedule/tests/catch/catch_amalgamated.cpp b/...work/schedule/tests/catch_amalgamated.cpp → ...chedule/tests/catch/catch_amalgamated.cpp
diff --git a/...work/schedule/tests/catch_amalgamated.hpp → ...chedule/tests/catch/catch_amalgamated.hpp b/...work/schedule/tests/catch_amalgamated.hpp → ...chedule/tests/catch/catch_amalgamated.hpp
diff --git a/homework/schedule/tests/catch_main.cpp → homework/schedule/tests/catch/catch_main.cpp b/homework/schedule/tests/catch_main.cpp → homework/schedule/tests/catch/catch_main.cpp
diff --git a/homework/schedule/tests/tests-bonus.cpp b/homework/schedule/tests/tests-bonus.cpp
@@ -1,6 +1,6 @@
 #include <chrono>
 #include <string>
-#include "catch_amalgamated.hpp"
+#include "catch/catch_amalgamated.hpp"
 #include "schedule.hpp"
 
 using namespace std::chrono_literals;
@@ -55,4 +55,4 @@ SCENARIO("Testing schedule function with any function", "[schedule][template][va
             }
         }
     }
-}
+}
diff --git a/homework/schedule/tests/tests.cpp b/homework/schedule/tests/tests.cpp
@@ -1,6 +1,6 @@
 #include <chrono>
 #include <string>
-#include "catch_amalgamated.hpp"
+#include "catch/catch_amalgamated.hpp"
 #include "schedule.hpp"
 
 using namespace std::chrono_literals;
@@ -69,4 +69,4 @@ SCENARIO("Testing schedule function with void(std::string, double)", "[schedule]
             }
         }
     }
-}
+}