Skip to content

Commit

Permalink
Strengthen test for configure timing (TriBITSPub#411)
Browse files Browse the repository at this point in the history
This checks that the timing in the correct format is printed (but can't check
the actual times). This will allow for trying to use updated CMake feature to
get the raw seconds.
  • Loading branch information
bartlettroscoe committed Jun 24, 2023
1 parent b691bce commit df56327
Showing 1 changed file with 26 additions and 24 deletions.
50 changes: 26 additions & 24 deletions test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1438,6 +1438,8 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_NoFortran_Ninja_Makefile

if (NOT ${PROJECT_NAME}_HOSTTYPE STREQUAL "Windows")

set(minSecRegex "[0-9][0-9]*m[0-9][0-9]*[.][0-9][0-9]*s")

tribits_add_advanced_test( TribitsExampleProject_ALL_PT_NoFortran_ConfigTiming
OVERALL_WORKING_DIRECTORY TEST_NAME
OVERALL_NUM_MPI_PROCS 1
Expand All @@ -1455,13 +1457,13 @@ if (NOT ${PROJECT_NAME}_HOSTTYPE STREQUAL "Windows")
-DTribitsExProj_ENABLE_CONFIGURE_TIMING=ON
${${PROJECT_NAME}_TRIBITS_DIR}/examples/TribitsExampleProject
PASS_REGULAR_EXPRESSION_ALL
"Total time to read in all dependencies files and build dependencies graph: "
"Total time to adjust package and TPL enables: "
"Total time to probe and setup the environment: "
"Total time to configure enabled external packages/TPLs: "
"Total time to configure enabled packages: "
"Total time to set up for CPack packaging: "
"Total time to configure TribitsExProj: "
"Total time to read in all dependencies files and build dependencies graph: ${minSecRegex}"
"Total time to adjust package and TPL enables: ${minSecRegex}"
"Total time to probe and setup the environment: ${minSecRegex}"
"Total time to configure enabled external packages/TPLs: ${minSecRegex}"
"Total time to configure enabled packages: ${minSecRegex}"
"Total time to set up for CPack packaging: ${minSecRegex}"
"Total time to configure TribitsExProj: ${minSecRegex}"
"Final set of enabled top-level packages: SimpleCxx WithSubpackages 2"
"Final set of enabled packages: SimpleCxx WithSubpackagesA WithSubpackages 3"

Expand All @@ -1471,15 +1473,15 @@ if (NOT ${PROJECT_NAME}_HOSTTYPE STREQUAL "Windows")
-DTribitsExProj_ENABLE_PACKAGE_CONFIGURE_TIMING=ON
.
PASS_REGULAR_EXPRESSION_ALL
"Total time to read in all dependencies files and build dependencies graph: "
"Total time to adjust package and TPL enables: "
"Total time to probe and setup the environment: "
"Total time to configure enabled external packages/TPLs: "
"-- Total time to configure top-level package SimpleCxx: "
"-- Total time to configure top-level package WithSubpackages: "
"Total time to configure enabled packages: "
"Total time to set up for CPack packaging: "
"Total time to configure TribitsExProj: "
"Total time to read in all dependencies files and build dependencies graph: ${minSecRegex}"
"Total time to adjust package and TPL enables: ${minSecRegex}"
"Total time to probe and setup the environment: ${minSecRegex}"
"Total time to configure enabled external packages/TPLs: ${minSecRegex}"
"-- Total time to configure top-level package SimpleCxx: ${minSecRegex}"
"-- Total time to configure top-level package WithSubpackages: ${minSecRegex}"
"Total time to configure enabled packages: ${minSecRegex}"
"Total time to set up for CPack packaging: ${minSecRegex}"
"Total time to configure TribitsExProj: ${minSecRegex}"

TEST_2 CMND ${CMAKE_COMMAND}
MESSAGE "Reconfigure to test out timing of just one package"
Expand All @@ -1488,14 +1490,14 @@ if (NOT ${PROJECT_NAME}_HOSTTYPE STREQUAL "Windows")
-DSimpleCxx_PACKAGE_CONFIGURE_TIMING=ON
.
PASS_REGULAR_EXPRESSION_ALL
"Total time to read in all dependencies files and build dependencies graph: "
"Total time to adjust package and TPL enables: "
"Total time to probe and setup the environment: "
"Total time to configure enabled external packages/TPLs: "
"-- Total time to configure top-level package SimpleCxx: "
"Total time to configure enabled packages: "
"Total time to set up for CPack packaging: "
"Total time to configure TribitsExProj: "
"Total time to read in all dependencies files and build dependencies graph: ${minSecRegex}"
"Total time to adjust package and TPL enables: ${minSecRegex}"
"Total time to probe and setup the environment: ${minSecRegex}"
"Total time to configure enabled external packages/TPLs: ${minSecRegex}"
"-- Total time to configure top-level package SimpleCxx: ${minSecRegex}"
"Total time to configure enabled packages: ${minSecRegex}"
"Total time to set up for CPack packaging: ${minSecRegex}"
"Total time to configure TribitsExProj: ${minSecRegex}"

)

Expand Down

0 comments on commit df56327

Please sign in to comment.