refactor: add warning to CMake if integration tests are enabled but build common is not.

Author: JoshuaSBrown

CMakeLists.txt

@@ -80,7 +80,6 @@ endif()
 
 if(NOT DEFINED DATAFED_DOMAIN)
   get_value_from_datafed_sh("DATAFED_DOMAIN" DATAFED_DOMAIN)
-  message("TESTING: DATAFED_DOMAIN : ${DATAFED_DOMAIN}")
 endif()
 
 if(NOT DEFINED DATAFED_DEPENDENCIES_INSTALL_PATH)

repository/gridftp/globus5/authz/tests/integration/CMakeLists.txt

@@ -15,7 +15,6 @@ foreach(PROG
   add_test(integration_${PROG} integration_${PROG})
 
   set_tests_properties(integration_${PROG} PROPERTIES FIXTURES_REQUIRED FIX_MOCK)
-  message("MOCK CORE KEY PATH: ${DATAFED_MOCK_CORE_PUB_KEY}")
 set_tests_properties(integration_${PROG} PROPERTIES
     ENVIRONMENT "DATAFED_MOCK_CORE_PUB_KEY=${DATAFED_MOCK_CORE_PUB_KEY}"
 )

tests/CMakeLists.txt

@@ -1,36 +1,39 @@
 
 if( ENABLE_INTEGRATION_TESTS )
+  if( BUILD_COMMON )
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_start.sh
+    ${CMAKE_CURRENT_BINARY_DIR}/mock/mock_start.sh
+    COPYONLY)
 
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_start.sh 
-  ${CMAKE_CURRENT_BINARY_DIR}/mock/mock_start.sh 
-  COPYONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_stop.sh
+    ${CMAKE_CURRENT_BINARY_DIR}/mock/mock_stop.sh
+    COPYONLY)
 
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_stop.sh 
-  ${CMAKE_CURRENT_BINARY_DIR}/mock/mock_stop.sh 
-  COPYONLY)
+    add_test(NAME start_mock
+      COMMAND ${CMAKE_CURRENT_BINARY_DIR}/mock/mock_start.sh
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tests/mock_core
+    )
 
-	add_test(NAME start_mock
-    COMMAND ${CMAKE_CURRENT_BINARY_DIR}/mock/mock_start.sh
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tests/mock_core
-	)
+    set(DATAFED_MOCK_CORE_PUB_KEY "${CMAKE_BINARY_DIR}/tests/mock_core/mock-datafed-core-key.pub" PARENT_SCOPE)
 
-  set(DATAFED_MOCK_CORE_PUB_KEY "${CMAKE_BINARY_DIR}/tests/mock_core/mock-datafed-core-key.pub" PARENT_SCOPE)
+    # Add a custom target to stop the server
+    add_test(NAME stop_mock
+      COMMAND ${CMAKE_CURRENT_BINARY_DIR}/mock/mock_stop.sh
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tests/mock_core
+    )
 
-	# Add a custom target to stop the server
-	add_test(NAME stop_mock
-    COMMAND ${CMAKE_CURRENT_BINARY_DIR}/mock/mock_stop.sh
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tests/mock_core
-	)
+    set_tests_properties(start_mock PROPERTIES FIXTURES_SETUP FIX_MOCK)
+    set_tests_properties(stop_mock PROPERTIES FIXTURES_CLEANUP FIX_MOCK)
 
-  set_tests_properties(start_mock PROPERTIES FIXTURES_SETUP FIX_MOCK)
-  set_tests_properties(stop_mock PROPERTIES FIXTURES_CLEANUP FIX_MOCK)
-
-  add_subdirectory(mock_core)
-  add_subdirectory(mock)
+    add_subdirectory(mock_core)
+    add_subdirectory(mock)
+  else()
+    message(WARNING "Integration tests are enabled but build common is disabled, if you wish to run the full suite of integration tests you will need to enable building the common library.")
+  endif()
 endif()
 
 if (ENABLE_END_TO_END_TESTS)
-	if (NOT ENABLE_END_TO_END_API_TESTS AND NOT ENABLE_END_TO_END_WEB_TESTS)
+  if (NOT ENABLE_END_TO_END_API_TESTS AND NOT ENABLE_END_TO_END_WEB_TESTS)
     message (FATAL_ERROR "Cannot run end-to-end tests because one of the ENABLE_END_TO_END web or API flag is not on")
   else()
     add_subdirectory(end-to-end)