Merge pull request #218 from Goddard-Fortran-Ecosystem/hotfix/cmake-fix-test-target

Fixes #216 - fixed support for "make test"

Author: tclune

CMakeLists.txt

@@ -25,7 +25,7 @@
 cmake_minimum_required(VERSION 3.12)
 
 project (PFUNIT
-  VERSION 4.1.8
+  VERSION 4.1.9
   LANGUAGES Fortran C)
 
 enable_testing()
@@ -105,7 +105,6 @@ find_package(Python)
 set(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "")
 set(CMAKE_SKIP_RPATH ON)
 
-add_custom_target(tests COMMAND ${CMAKE_CTEST_COMMAND})
 set (dest "PFUNIT-${PFUNIT_VERSION_MAJOR}.${PFUNIT_VERSION_MINOR}")
 
 # Code to silence warnings from RANLIB on OSX
@@ -115,11 +114,27 @@ if (APPLE)
   SET(CMAKE_Fortran_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
 endif ()
 
+add_custom_target(build-tests)
+
+add_custom_target(tests
+  COMMAND ${CMAKE_CTEST_COMMAND}
+  EXCLUDE_FROM_ALL)
+add_dependencies(tests build-tests)
+
+
 add_subdirectory (extern)
 add_subdirectory (src)
-add_subdirectory (tests)
 add_subdirectory (include)
 add_subdirectory (bin)
+add_subdirectory (tests EXCLUDE_FROM_ALL)
+
+# The following forces tests to be built when using "make ctest" even if some targets
+# are EXCLUDE_FROM_ALL
+# From https://stackoverflow.com/questions/733475/cmake-ctest-make-test-doesnt-build-tests/56448477#56448477
+build_command(CTEST_CUSTOM_PRE_TEST TARGET build-tests)
+string(CONFIGURE \"@CTEST_CUSTOM_PRE_TEST@\" CTEST_CUSTOM_PRE_TEST_QUOTED ESCAPE_QUOTES)
+file(WRITE "${CMAKE_BINARY_DIR}/CTestCustom.cmake" "set(CTEST_CUSTOM_PRE_TEST ${CTEST_CUSTOM_PRE_TEST_QUOTED})" "\n")
+
 
 
 

ChangeLog.md

@@ -4,6 +4,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+	
+## [4.1.9] - 2020-05-29
+
+### Fixed
+- Changed internal cmake dependencies so that "make test" will now build
+  tests.   The tests and test executables are intentionally EXCLUDE_FROM_OLL
+  which interferes with some canonical ways of driving cmake projects.
+  "make tests" will continue to work as before.
+  
 
 ## [4.1.8] - 2020-05-12
 

tests/fhamcrest/CMakeLists.txt

@@ -23,11 +23,11 @@ set(pf_tests
 set(test_srcs)
 add_pfunit_sources (test_srcs ${pf_tests})
 
-add_library(fhamcrest_tests EXCLUDE_FROM_ALL ${test_srcs})
+add_library(fhamcrest_tests  ${test_srcs})
 target_link_libraries(fhamcrest_tests funit)
 
 configure_file(${CMAKE_SOURCE_DIR}/include/driver.F90 driver.F90)
-add_executable (fhamcrest_tests.x EXCLUDE_FROM_ALL driver.F90)
+add_executable (fhamcrest_tests.x driver.F90)
 set_source_files_properties(driver.F90 PROPERTIES COMPILE_DEFINITIONS _TEST_SUITES="testSuites.inc")
 set_source_files_properties(driver.F90 PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/testSuites.inc)
 target_link_libraries(fhamcrest_tests.x fhamcrest_tests)
@@ -38,7 +38,7 @@ add_test(NAME fhamcrest_tests
   COMMAND fhamcrest_tests.x
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
-add_dependencies(tests fhamcrest_tests.x)
+add_dependencies(build-tests fhamcrest_tests.x)
 set_property (TEST fhamcrest_tests
     PROPERTY FAIL_REGULAR_EXPRESSION "Encountered 1 or more failures/errors during testing"
     )

tests/funit-core/CMakeLists.txt

@@ -76,7 +76,7 @@ if (OPENMP_FORTRAN_FOUND)
 endif ()
 
 
-add_library (funit_tests EXCLUDE_FROM_ALL STATIC ${test_srcs})
+add_library (funit_tests STATIC ${test_srcs})
 target_link_libraries(funit_tests other_shared)
 
 #add_pfunit_sources (new_test_srcs ${pf_tests})
@@ -94,10 +94,17 @@ if (NOT SKIP_ROBUST)
   target_compile_definitions(funit_tests.x PRIVATE Robust)
 endif ()
 
+add_test(NAME old_tests
+  COMMAND funit_tests.x
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  )
+add_dependencies(build-tests funit_tests.x)
+
 if (NOT SKIP_ROBUST)
   set (REMOTE_EXE remote.x)
   add_executable (${REMOTE_EXE} EXCLUDE_FROM_ALL serialRemoteProgram.F90)
   target_link_libraries(${REMOTE_EXE} funit funit_tests)
+  add_dependencies(funit_tests.x ${REMOTE_EXE})
   add_dependencies(tests ${REMOTE_EXE})
 endif ()
 
@@ -107,22 +114,8 @@ add_pfunit_ctest (new_tests.x
   LINK_LIBRARIES other_shared
   REGISTRY testSuites.inc
 )
-#add_test(NAME new_tests
-#  COMMAND new_tests.x
-#  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-#  )
-
-add_dependencies(tests new_tests.x)
-#set_property (TEST new_tests.x
-#    PROPERTY FAIL_REGULAR_EXPRESSION "Encountered 1 or more failures/errors during testing"
-#    )
-
-add_test(NAME old_tests
-  COMMAND funit_tests.x
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  )
-add_dependencies(tests funit_tests.x)
 
+add_dependencies(build-tests new_tests.x)
 set_property (TEST old_tests
     PROPERTY FAIL_REGULAR_EXPRESSION "Encountered 1 or more failures/errors during testing"
     )

tests/pfunit/CMakeLists.txt

@@ -63,7 +63,7 @@ add_test(NAME mpi-tests
   COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} 4 ./parallel_tests.x
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
-add_dependencies(tests parallel_tests.x)
+add_dependencies(build-tests parallel_tests.x)
 
 add_test(NAME new_ptests
   COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} 4 ./new_ptests.x
@@ -72,5 +72,4 @@ add_test(NAME new_ptests
 set_property (TEST new_ptests
   PROPERTY FAIL_REGULAR_EXPRESSION "Encountered 1 or more failures/errors during testing"
   )
-
-add_dependencies(tests new_ptests.x)
+add_dependencies(build-tests new_ptests.x)