Added test for python when running HTTP server unit tests.

glynos · glynos · commit 8e6237c001da · 2011-11-30T21:59:44.000+01:00
diff --git a/libs/network/test/http/CMakeLists.txt b/libs/network/test/http/CMakeLists.txt
@@ -7,6 +7,7 @@
 include_directories(${CPP-NETLIB_SOURCE_DIR})
 find_package( Boost 1.45.0 REQUIRED unit_test_framework system regex thread filesystem )
 find_package( OpenSSL )
+find_package( PythonInterp )
 
 if (OPENSSL_FOUND)
     include_directories( ${OPENSSL_INCLUDE_DIR} )
@@ -60,31 +61,36 @@ if (Boost_FOUND)
             ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
     endforeach (test)
 
-    set ( SERVER_TESTS
+    if ( PYTHONINTERP_FOUND )
+      set ( SERVER_TESTS
         server_hello_world
         server_async
         server_async_less_copy
         )
-    set ( PORT 8000 )
-    foreach ( test ${SERVER_TESTS} )
+      set ( PORT 8000 )
+      foreach ( test ${SERVER_TESTS} )
         if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
-            set_source_files_properties(${test}.cpp
-                PROPERTIES COMPILE_FLAGS "-Wall")
+          set_source_files_properties(${test}.cpp
+            PROPERTIES COMPILE_FLAGS "-Wall")
         endif()
         add_executable(cpp-netlib-http-${test} ${test}.cpp)
         add_dependencies(cpp-netlib-http-${test} cppnetlib-server-parsers)
         target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
         set_target_properties(cpp-netlib-http-${test}
-            PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-            ${CPP-NETLIB_BINARY_DIR}/tests)
+          PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+          ${CPP-NETLIB_BINARY_DIR}/tests)
         add_test(cpp-netlib-${test}
-            python
-            ${CPP-NETLIB_SOURCE_DIR}/libs/network/test/httplib_acceptance.py
-            ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}
-            ${PORT}
-            ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}.passed)
+          ${PYTHON_EXECUTABLE}
+          ${CPP-NETLIB_SOURCE_DIR}/libs/network/test/httplib_acceptance.py
+          ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}
+          ${PORT}
+          ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}.passed)
         math (EXPR PORT "${PORT} + 1")
-    endforeach (test)
+      endforeach (test)
+    #else()
+    #  message(STATUS "Python not found, won't run server tests."
+    endif( PYTHONINTERP_FOUND )
+
 
     #set ( INLINED_TESTS
     #    client_include_inlined
