ADD_SUBDIRECTORY(contrib) # has to be included after source
ADD_SUBDIRECTORY(examples)
-ADD_SUBDIRECTORY(build_tests)
+ADD_SUBDIRECTORY(quick_tests)
+
IF(BUILD_TESTING AND DEAL_II_HAVE_TESTS_DIRECTORY)
ADD_SUBDIRECTORY(${TEST_DIR} ${CMAKE_BINARY_DIR}/tests)
ENDIF()
MESSAGE("Test ${TEST}: PASSED")
MESSAGE("=============================== OUTPUT BEGIN ===============================")
+ #
# Do not output everything, just that we are successful:
- IF(TRGT MATCHES "\\.diff$")
+ #
+ IF(TRGT MATCHES "\\.diff$") # ordinary test:
MESSAGE("${TEST}: BUILD successful.")
MESSAGE("${TEST}: RUN successful.")
MESSAGE("${TEST}: DIFF successful.")
MESSAGE("${TEST}: PASSED.")
- ELSE()
+ ELSEIF(TRGT MATCHES "\\.run$") # build_test for steps:
+ MESSAGE("${TEST}: CONFIGURE successful.")
+ MESSAGE("${TEST}: BUILD successful.")
+ MESSAGE("${TEST}: RUN successful.")
+ MESSAGE("${TEST}: PASSED.")
+ ELSEIF(TRGT MATCHES "\\.build$") # build_test for steps:
+ MESSAGE("${TEST}: CONFIGURE successful.")
+ MESSAGE("${TEST}: BUILD successful.")
+ MESSAGE("${TEST}: PASSED.")
+ ELSE() # all-headers test:
MESSAGE("${TEST}: BUILD successful.")
MESSAGE("${TEST}: PASSED.")
ENDIF()
MESSAGE("=============================== OUTPUT END ===============================")
ELSE()
+
#
- # Determine whether the BUILD or RUN stages were run successfully:
+ # Determine whether the CONFIGURE, BUILD or RUN stages were run successfully:
#
+
+ # configure is special because it only exists in build tests:
+ STRING(REGEX MATCH "${TEST}: CONFIGURE failed\\." _configure_regex ${_output})
STRING(REGEX MATCH "${TEST}: BUILD successful\\." _build_regex ${_output})
STRING(REGEX MATCH "${TEST}: RUN successful\\." _run_regex ${_output})
- IF("${_build_regex}" STREQUAL "")
+ IF(NOT "${_configure_regex}" STREQUAL "")
+ SET(_stage CONFIGURE)
+ ELSEIF("${_build_regex}" STREQUAL "")
SET(_stage BUILD)
ELSEIF("${_run_regex}" STREQUAL "")
SET(_stage RUN)
SET(_stage DIFF)
ENDIF()
+
MESSAGE("Test ${TEST}: ${_stage}")
MESSAGE("=============================== OUTPUT BEGIN ===============================")
IF("${_build_regex}" STREQUAL "")
*/
-
// @sect3{Include files}
// The most fundamental class in the library is the Triangulation class, which
## ---------------------------------------------------------------------
#
-# Setup and run the testsuite:
+# Setup the testsuite:
#
-
INCLUDE(setup_testsuite)
+#
+# And include all subdirectories:
+#
MESSAGE(STATUS "")
MESSAGE(STATUS "Proceed to test definitions now:")
-ADD_SUBDIRECTORY(a-framework)
+#ADD_SUBDIRECTORY(a-framework) -- no idea what to do with that ...
+
ADD_SUBDIRECTORY(all-headers)
ADD_SUBDIRECTORY(aniso)
ADD_SUBDIRECTORY(base)
ADD_SUBDIRECTORY(bits)
+ADD_SUBDIRECTORY(build_tests)
ADD_SUBDIRECTORY(codim_one)
ADD_SUBDIRECTORY(deal.II)
ADD_SUBDIRECTORY(metis)
ENDIF()
+# TODO: Really with P4EST?
IF(DEAL_II_WITH_MPI AND DEAL_II_WITH_P4EST)
ADD_SUBDIRECTORY(gla)
ADD_SUBDIRECTORY(mpi)
FOREACH(_build ${DEAL_II_BUILD_TYPES})
STRING(TOLOWER ${_build} _build_lowercase)
- SET(_test ${_category}-${_path}-${_file}.${_build_lowercase})
-
+ SET(_test ${_category}/${_path}/${_file}.${_build_lowercase})
+ SET(_target ${_category}-${_path}-${_file}.${_build_lowercase})
#
# Respect TEST_PICKUP_REGEX:
#
#
# Add an object library for each header file and build configuration:
#
- ADD_LIBRARY(${_test} OBJECT EXCLUDE_FROM_ALL test_header.cc)
- SET_TARGET_PROPERTIES(${_test} PROPERTIES
+ ADD_LIBRARY(${_target} OBJECT EXCLUDE_FROM_ALL test_header.cc)
+ SET_TARGET_PROPERTIES(${_target} PROPERTIES
COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${_build}}"
COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_${_build}}"
)
- SET_PROPERTY(TARGET ${_test} APPEND PROPERTY
+ SET_PROPERTY(TARGET ${_target} APPEND PROPERTY
INCLUDE_DIRECTORIES
"${CMAKE_BINARY_DIR}/include"
"${CMAKE_SOURCE_DIR}/include"
"${CMAKE_SOURCE_DIR}/include/deal.II/"
)
- SET_PROPERTY(TARGET ${_test} APPEND PROPERTY
+ SET_PROPERTY(TARGET ${_target} APPEND PROPERTY
COMPILE_DEFINITIONS
HEADER=<deal.II/${_path}/${_file}>
)
#
# And finally add the test:
#
- ADD_TEST(NAME ${_category}/${_path}/${_file}.${_build_lowercase}
+ ADD_TEST(NAME ${_test}
COMMAND ${CMAKE_COMMAND}
- -DTRGT=${_test}
+ -DTRGT=${_target}
-DTEST=${_category}/${_path}/${_file}.${_build_lowercase}
-DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR}
-P ${CMAKE_SOURCE_DIR}/cmake/scripts/run_test.cmake
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
- SET_TESTS_PROPERTIES(${_category}/${_path}/${_file}.${_build_lowercase} PROPERTIES
+ SET_TESTS_PROPERTIES(${_test} PROPERTIES
LABEL "${_category}"
TIMEOUT ${TEST_TIME_LIMIT}
)