Skip to content

Commit

Permalink
Add VERY_SHORT_TESTS cmake option to be able to test if the mmg appli…
Browse files Browse the repository at this point in the history
…cations and library are able to run simple tests (without downloading the ci tests of Mmg).
  • Loading branch information
Algiane committed May 2, 2017
1 parent 88107da commit fa00f0d
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 17 deletions.
24 changes: 18 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,11 @@ ENDIF ( )

OPTION ( BUILD_TESTING "Enable/Disable continuous integration" OFF )

CMAKE_DEPENDENT_OPTION (
ONLY_VERY_SHORT_TESTS "Enable/Disable very short tests" OFF
"BUILD_TESTING;NOT LONG_TESTS" OFF )
MARK_AS_ADVANCED(ONLY_VERY_SHORT_TESTS)

CMAKE_DEPENDENT_OPTION (
LONG_TESTS "Enable/Disable time consuming tests for the project" OFF
"BUILD_TESTING" OFF )
Expand All @@ -389,10 +394,15 @@ CMAKE_DEPENDENT_OPTION ( COVERAGE "Watch code coverage (Linux only)" OFF

IF( BUILD_TESTING )

##-------------------------------------------------------------------##
##------- Get the continuous integration tests ----------------------##
##-------------------------------------------------------------------##
INCLUDE(cmake/modules/LoadCiTests.cmake)
SET ( CTEST_OUTPUT_DIR ${CMAKE_BINARY_DIR}/TEST_OUTPUTS )
FILE ( MAKE_DIRECTORY ${CTEST_OUTPUT_DIR} )

IF ( NOT ONLY_VERY_SHORT_TESTS )
##-------------------------------------------------------------------##
##------- Get the continuous integration tests ----------------------##
##-------------------------------------------------------------------##
INCLUDE(cmake/modules/LoadCiTests.cmake)
ENDIF ( )

##-------------------------------------------------------------------##
##------- Set the continuous integration options --------------------##
Expand Down Expand Up @@ -460,8 +470,10 @@ IF( BUILD_TESTING )
FILE(COPY ${MMG_CI_TESTS}/LeakCheck_AbnormalEnd8/dsol.sol
DESTINATION ${MMG_CI_TESTS}/LeakCheck_AbnormalEnd8/unwrittable.sol)

# Add common tests for mmgs/3d appli
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmg_tests.cmake )
IF ( NOT ONLY_VERY_SHORT_TESTS )
# Add common tests for mmgs/3d appli
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmg_tests.cmake )
ENDIF ( )

ENDIF(MMG3D_CI OR MMGS_CI)

Expand Down
12 changes: 11 additions & 1 deletion cmake/modules/mmg2d.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,18 @@ IF ( BUILD_TESTING )
ENDIF()

ENDIF()

# Add mmg2d tests
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmg2d_tests.cmake )
IF ( ONLY_VERY_SHORT_TESTS )
SET ( CTEST_OUTPUT_DIR ${CMAKE_BINARY_DIR}/TEST_OUTPUTS )

ADD_TEST(NAME mmg2d_very_short COMMAND ${EXECUT_MMG2D}
"${CMAKE_SOURCE_DIR}/libexamples/mmg2d/adaptation_example0/example0_a/init.mesh"
"${CTEST_OUTPUT_DIR}/libmmg2d_Adaptation_0_a-init.o"
)
ELSE ( )
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmg2d_tests.cmake )
ENDIF ( )

ENDIF( MMG2D_CI )

Expand Down
19 changes: 14 additions & 5 deletions cmake/modules/mmg3d.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,21 @@ IF ( BUILD_TESTING )

ENDIF ( TEST_LIBMMG3D )

# Add more tests
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmg3d_tests.cmake )
IF ( ONLY_VERY_SHORT_TESTS )
SET ( CTEST_OUTPUT_DIR ${CMAKE_BINARY_DIR}/TEST_OUTPUTS )

IF ( RUN_AGAIN )
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmg3d_rerun_tests.cmake )
ENDIF()
ADD_TEST(NAME mmg3d_very_short COMMAND ${EXECUT_MMG3D}
"${CMAKE_SOURCE_DIR}/libexamples/mmg3d/adaptation_example0/example0_a/cube.mesh"
"${CTEST_OUTPUT_DIR}/libmmg3d_Adaptation_0_a-cube.o"
)
ELSE ( )
# Add more tests
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmg3d_tests.cmake )

IF ( RUN_AGAIN )
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmg3d_rerun_tests.cmake )
ENDIF()
ENDIF ( )

ENDIF ( MMG3D_CI )

Expand Down
20 changes: 15 additions & 5 deletions cmake/modules/mmgs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,23 @@ IF ( BUILD_TESTING )
ENDIF()

ENDIF()
# Add mmgs tests
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmgs_tests.cmake )

IF ( RUN_AGAIN )
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmgs_rerun_tests.cmake )
ENDIF()
IF ( ONLY_VERY_SHORT_TESTS )
# Add mmgs tests
SET ( CTEST_OUTPUT_DIR ${CMAKE_BINARY_DIR}/TEST_OUTPUTS )

ADD_TEST(NAME mmgs_very_short COMMAND ${EXECUT_MMGS}
"${CMAKE_SOURCE_DIR}/libexamples/mmgs/adaptation_example0/example0_a/cube.mesh"
"${CTEST_OUTPUT_DIR}/libmmgs_Adaptation_0_a-cube.o"
)

ELSE ( )
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmgs_tests.cmake )

IF ( RUN_AGAIN )
INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/testing/mmgs_rerun_tests.cmake )
ENDIF()
ENDIF ( )

ENDIF ( MMGS_CI )

Expand Down

0 comments on commit fa00f0d

Please sign in to comment.