From 4bd4015f9dddf6fc45b79f1b63a109fb7f32e4b6 Mon Sep 17 00:00:00 2001 From: Francois Best Date: Mon, 3 Oct 2016 20:34:43 -0700 Subject: [PATCH] Binding Google Test into CMake. --- CMakeLists.txt | 1 + external/CMakeLists.txt | 1 + test/runner/CMakeLists.txt | 6 ++++++ test/runner/test-runner_Main.cpp | 16 ++++------------ test/runner/test-runner_Main.h | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 external/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 65babf9..0ca2c9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,5 +4,6 @@ project(arduino_midi_library) set(ROOT_SOURCE_DIR ${PROJECT_SOURCE_DIR}) include_directories(${ROOT_SOURCE_DIR}) +add_subdirectory(external) add_subdirectory(src) add_subdirectory(test) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt new file mode 100644 index 0000000..9a20729 --- /dev/null +++ b/external/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(google-test) diff --git a/test/runner/CMakeLists.txt b/test/runner/CMakeLists.txt index 50efab6..f619c7c 100644 --- a/test/runner/CMakeLists.txt +++ b/test/runner/CMakeLists.txt @@ -1,5 +1,7 @@ project(test-runner) +include_directories(${gtest_SOURCE_DIR}/include) + add_executable(test-runner test-runner.cpp test-runner.h @@ -7,3 +9,7 @@ add_executable(test-runner test-runner_Main.cpp test-runner_Main.h ) +target_link_libraries(test-runner + test-mocks + gtest +) diff --git a/test/runner/test-runner_Main.cpp b/test/runner/test-runner_Main.cpp index d5cfa6b..9691a61 100644 --- a/test/runner/test-runner_Main.cpp +++ b/test/runner/test-runner_Main.cpp @@ -1,15 +1,7 @@ #include "test-runner_Main.h" +#include -BEGIN_TEST_RUNNER_NAMESPACE - -bool run() -{ - return false; -} - -END_TEST_RUNNER_NAMESPACE - -int main() -{ - return TEST_RUNNER_NAMESPACE::run() ? 0 : 1; +int main(int argc, char **argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } diff --git a/test/runner/test-runner_Main.h b/test/runner/test-runner_Main.h index 690391c..e875f19 100644 --- a/test/runner/test-runner_Main.h +++ b/test/runner/test-runner_Main.h @@ -6,4 +6,4 @@ BEGIN_TEST_RUNNER_NAMESPACE END_TEST_RUNNER_NAMESPACE -int main(); +int main(int argc, char **argv);