From 618073e2b42b4d72ce05ed15cf61ffefeeefcab5 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Sat, 12 Mar 2016 00:57:30 +0100
Subject: [PATCH] cmake: add "check" target

Add a "check" target that builds tests before running them.
---
 CMakeLists.txt       | 8 +++-----
 src/CMakeLists.txt   | 1 +
 tests/CMakeLists.txt | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7f68b82..7402244b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,6 +170,9 @@ endif()
 find_package(CUnit 2.1)
 enable_testing()
 set(HAVE_CUNIT      ${CUNIT_FOUND})
+if(HAVE_CUNIT)
+  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
+endif()
 
 # openssl (for src)
 set(HAVE_OPENSSL    ${OPENSSL_FOUND})
@@ -357,11 +360,6 @@ if(NOT ENABLE_THREADS OR NOT HAVE_STD_FUTURE)
   set(NOTHREADS 1)
 endif()
 
-# # propagate $enable_static to tests/Makefile.am
-# AM_CONDITIONAL([ENABLE_STATIC], [test "x$enable_static" = "xyes"])
-#
-# AC_SUBST([APPLDFLAGS])
-
 add_definitions(-DHAVE_CONFIG_H)
 configure_file(cmakeconfig.h.in config.h)
 # autotools-compatible names
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dfd4a7c9..83903dda 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -173,6 +173,7 @@ if(ENABLE_APP)
     endif()
 
     add_test(nghttpx-unittest nghttpx-unittest)
+    add_dependencies(check nghttpx-unittest)
   endif()
 
   add_executable(nghttp   ${NGHTTP_SOURCES}   $<TARGET_OBJECTS:http-parser>)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5a641834..8ce64154 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -33,6 +33,7 @@ if(HAVE_CUNIT)
     ${CUNIT_LIBRARIES}
   )
   add_test(main main)
+  add_dependencies(check main)
 
   if(ENABLE_FAILMALLOC)
     set(FAILMALLOC_SOURCES
@@ -48,6 +49,7 @@ if(HAVE_CUNIT)
       ${CUNIT_LIBRARIES}
     )
     add_test(failmalloc failmalloc)
+    add_dependencies(check failmalloc)
   endif()
 
   if(ENABLE_APP)