aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2016-12-17 21:00:34 -0800
committerGarrett D'Amore <garrett@damore.org>2016-12-17 21:00:34 -0800
commit60e5d370dec0a3f259b11d3aabb864a5f8f6a087 (patch)
tree9e8401c1fb58c73e70fd671df3070c173475af51
parent01b53ac4ce84aae2b2a1dcb1a68f748fd16f0ede (diff)
downloadnng-60e5d370dec0a3f259b11d3aabb864a5f8f6a087.tar.gz
nng-60e5d370dec0a3f259b11d3aabb864a5f8f6a087.tar.bz2
nng-60e5d370dec0a3f259b11d3aabb864a5f8f6a087.zip
So "test" target now does something useful.
-rw-r--r--CMakeLists.txt6
-rw-r--r--tests/CMakeLists.txt3
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})