From 6805da501404352fe16fb2010d1b9dc97d6b22af Mon Sep 17 00:00:00 2001 From: Johannes Theiner Date: Thu, 7 Nov 2019 17:19:10 +0100 Subject: [PATCH] ~ fixing style issues --- .ci/clang-tidy.sh | 2 +- test/public_test.cpp | 2 +- test/test_main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 .ci/clang-tidy.sh diff --git a/.ci/clang-tidy.sh b/.ci/clang-tidy.sh old mode 100644 new mode 100755 index eae5b12..c20c8fb --- a/.ci/clang-tidy.sh +++ b/.ci/clang-tidy.sh @@ -9,7 +9,7 @@ filelist="$(find . -not \( -path './client/cpptoml/*' -prune \) -type f ! -name for file in $filelist; do if echo "$file" | grep -q -E ".*\.cpp$" ; then #Extra check missing dependencies due to clang-tidy doesn't toggle exit code. - clang_tidy_lib_check="$(clang-tidy -warnings-as-errors='*' -header-filter='.*,-cpptoml.hpp' -checks='*,-llvm-header-guard,-fuchsia-statically-constructed-objects,-fuchsia-default-arguments,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-constant-array-index,-bugprone-narrowing-conversions,-cppcoreguidelines-narrowing-conversions,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-hicpp-signed-bitwise,-bugprone-exception-escape,-cppcoreguidelines-pro-type-member-init,-cppcoreguidelines-pro-type-cstyle-cast,-hicpp-member-init' "$file" -- -I. -std=c++14 2>&1)" + clang_tidy_lib_check="$(clang-tidy -warnings-as-errors='*' -header-filter='.*,-cpptoml.hpp' -checks='*,-llvm-header-guard,-fuchsia-statically-constructed-objects,-fuchsia-default-arguments,-fuchsia-default-argument-calls,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-constant-array-index,-bugprone-narrowing-conversions,-cppcoreguidelines-narrowing-conversions,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-hicpp-signed-bitwise,-bugprone-exception-escape,-cppcoreguidelines-pro-type-member-init,-cppcoreguidelines-pro-type-cstyle-cast,-hicpp-member-init' "$file" -- -I. -std=c++14 2>&1)" for tidy_line in $clang_tidy_lib_check; do echo "$tidy_line" | grep -q -v -E "^Error while processing*" if [ $? -eq 1 ]; then diff --git a/test/public_test.cpp b/test/public_test.cpp index 6ee3b23..2806ff4 100644 --- a/test/public_test.cpp +++ b/test/public_test.cpp @@ -1,4 +1,4 @@ -#include +#include "catch2/catch.hpp" #include "../src/vkvm.h" TEST_CASE("add works") { diff --git a/test/test_main.cpp b/test/test_main.cpp index 1a32dbe..ef0a1b7 100644 --- a/test/test_main.cpp +++ b/test/test_main.cpp @@ -1,6 +1,6 @@ #define CATCH_CONFIG_MAIN -#include +#include "catch2/catch.hpp" //Dont touch this file. // add your own tests in this directory according to https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md \ No newline at end of file