From 60e5d370dec0a3f259b11d3aabb864a5f8f6a087 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 17 Dec 2016 21:00:34 -0800 Subject: So "test" target now does something useful. --- CMakeLists.txt | 6 +++++- tests/CMakeLists.txt | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d41a5b2b..9d8fa8cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,7 +205,11 @@ endif () add_subdirectory (src) -add_subdirectory (tests) +if (NNG_TESTS) + enable_testing() + set(all_tests, "") + add_subdirectory (tests) +endif() # Build the tools diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1d8bcad5..e2ccde6b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -28,9 +28,6 @@ if (NNG_TESTS) - enable_testing () - set (all_tests "") - set (TEST_PORT 12100) macro (add_nng_test NAME TIMEOUT) list (APPEND all_tests ${NAME}) -- cgit v1.2.3-70-g09d2