cmake cleanup

 * Removed useless include_directories
 * Print ssl library path in build summary
 * ExternalProject also exists on 2.8.0
 * include pummel tests when testing with ctest
 * Moved tests.cmake to test/CMakeList.txt
 * Removed inconsistent, unnecessary condition in else

1 files changed, 88 insertions, 0 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 00000000000..6c4d05e2b12
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,88 @@
+#
+# tests
+#
+
+if(${CMAKE_BUILD_TYPE} MATCHES Debug)
+  set(test_bin_dir debug)
+  get_target_property(node_bin node DEBUG_LOCATION)
+else()
+  set(test_bin_dir default)
+  get_target_property(node_bin node LOCATION)
+endif()
+
+file(GLOB_RECURSE node_tests ${CMAKE_SOURCE_DIR}/test/*)
+
+# add all tests with add_test
+foreach(test ${node_tests})
+  if(test MATCHES ".*/test-[^./\ ]*.\\.js"
+      AND NOT test MATCHES ".*disabled.*")
+
+    # build a fancy name for each test
+    string(REPLACE ${CMAKE_SOURCE_DIR}/test/ "" test_name ${test})
+    string(REPLACE test- "" test_name ${test_name})
+    string(REPLACE ".js" "" test_name ${test_name})
+    string(REPLACE "/" "-" test_name ${test_name})
+
+    add_test(${test_name} ${node_bin} ${test})
+  endif()
+endforeach()
+
+# the CTest custom config makes ctest recreate the tmp directory before and after
+# each run
+configure_file(${CMAKE_SOURCE_DIR}/cmake/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake COPYONLY)
+
+add_custom_command(
+  TARGET node POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${test_bin_dir}
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${node_bin} ${PROJECT_BINARY_DIR}/${test_bin_dir}
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+# this target gets overriden by ctest's test target
+# add_custom_target(
+#   test
+#   COMMAND python tools/test.py --mode=release simple message
+#   DEPENDS node
+#   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+#   )
+
+add_custom_target(test-all
+  COMMAND python tools/test.py --mode=debug,release
+  DEPENDS node
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+  )
+
+add_custom_target(test-release
+  COMMAND python tools/test.py --mode=release
+  DEPENDS node
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+  )
+
+add_custom_target(test-debug
+  COMMAND python tools/test.py --mode=debug
+  DEPENDS node
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+  )
+
+add_custom_target(test-message
+  COMMAND python tools/test.py message
+  DEPENDS node
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+  )
+
+add_custom_target(test-simple
+  COMMAND python tools/test.py simple
+  DEPENDS node
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+  )
+
+add_custom_target(test-pummel
+  COMMAND python tools/test.py pummel
+  DEPENDS node
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+  )
+
+add_custom_target(test-internet
+  COMMAND python tools/test.py internet
+  DEPENDS node
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+  )