From f42b31b918ed701b85334495a183ab48dc3e33be Mon Sep 17 00:00:00 2001 From: Florian Albrechtskirchinger Date: Mon, 25 Jul 2022 13:08:30 +0200 Subject: [PATCH] Format more files in tests directory --- Makefile | 3 +++ tests/cmake_add_subdirectory/project/main.cpp | 2 +- tests/cmake_fetch_content/project/main.cpp | 2 +- tests/cmake_fetch_content2/project/main.cpp | 2 +- tests/cmake_import/project/main.cpp | 2 +- tests/cmake_import_minver/project/main.cpp | 2 +- tests/cmake_target_include_directories/project/Bar.hpp | 2 +- tests/cmake_target_include_directories/project/Foo.hpp | 2 +- tests/cmake_target_include_directories/project/main.cpp | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 972f7f5ee..8648b8ba7 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,9 @@ SED:=$(shell command -v gsed || which sed) # the list of sources in the include folder SRCS=$(shell find include -type f | sort) +# the list of sources in the tests folder +TESTS_SRCS=$(shell find tests -type f \( -name '*.hpp' -o -name '*.cpp' -o -name '*.cu' \) -not -path 'tests/thirdparty/*' | sort) + # the single header (amalgamated from the source files) AMALGAMATED_FILE=single_include/nlohmann/json.hpp diff --git a/tests/cmake_add_subdirectory/project/main.cpp b/tests/cmake_add_subdirectory/project/main.cpp index d2d118b85..9f71eb32a 100644 --- a/tests/cmake_add_subdirectory/project/main.cpp +++ b/tests/cmake_add_subdirectory/project/main.cpp @@ -1,6 +1,6 @@ #include -int main(int argc, char **argv) +int main(int argc, char** argv) { nlohmann::json j; diff --git a/tests/cmake_fetch_content/project/main.cpp b/tests/cmake_fetch_content/project/main.cpp index d2d118b85..9f71eb32a 100644 --- a/tests/cmake_fetch_content/project/main.cpp +++ b/tests/cmake_fetch_content/project/main.cpp @@ -1,6 +1,6 @@ #include -int main(int argc, char **argv) +int main(int argc, char** argv) { nlohmann::json j; diff --git a/tests/cmake_fetch_content2/project/main.cpp b/tests/cmake_fetch_content2/project/main.cpp index d2d118b85..9f71eb32a 100644 --- a/tests/cmake_fetch_content2/project/main.cpp +++ b/tests/cmake_fetch_content2/project/main.cpp @@ -1,6 +1,6 @@ #include -int main(int argc, char **argv) +int main(int argc, char** argv) { nlohmann::json j; diff --git a/tests/cmake_import/project/main.cpp b/tests/cmake_import/project/main.cpp index d2d118b85..9f71eb32a 100644 --- a/tests/cmake_import/project/main.cpp +++ b/tests/cmake_import/project/main.cpp @@ -1,6 +1,6 @@ #include -int main(int argc, char **argv) +int main(int argc, char** argv) { nlohmann::json j; diff --git a/tests/cmake_import_minver/project/main.cpp b/tests/cmake_import_minver/project/main.cpp index d2d118b85..9f71eb32a 100644 --- a/tests/cmake_import_minver/project/main.cpp +++ b/tests/cmake_import_minver/project/main.cpp @@ -1,6 +1,6 @@ #include -int main(int argc, char **argv) +int main(int argc, char** argv) { nlohmann::json j; diff --git a/tests/cmake_target_include_directories/project/Bar.hpp b/tests/cmake_target_include_directories/project/Bar.hpp index bdb1d9b5c..454ced3a3 100644 --- a/tests/cmake_target_include_directories/project/Bar.hpp +++ b/tests/cmake_target_include_directories/project/Bar.hpp @@ -1,4 +1,4 @@ #include #include "Foo.hpp" -class Bar : public Foo{}; +class Bar : public Foo {}; diff --git a/tests/cmake_target_include_directories/project/Foo.hpp b/tests/cmake_target_include_directories/project/Foo.hpp index fd6b1ffac..f97c68902 100644 --- a/tests/cmake_target_include_directories/project/Foo.hpp +++ b/tests/cmake_target_include_directories/project/Foo.hpp @@ -1,4 +1,4 @@ #pragma once #include -class Foo{}; +class Foo {}; diff --git a/tests/cmake_target_include_directories/project/main.cpp b/tests/cmake_target_include_directories/project/main.cpp index d2d118b85..9f71eb32a 100644 --- a/tests/cmake_target_include_directories/project/main.cpp +++ b/tests/cmake_target_include_directories/project/main.cpp @@ -1,6 +1,6 @@ #include -int main(int argc, char **argv) +int main(int argc, char** argv) { nlohmann::json j;