Skip to content

Include utility name in the name of the test in the cmake output #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edwardhartnett merged 17 commits into from
Apr 29, 2021
Merged

Include utility name in the name of the test in the cmake output #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0ec1aae
added slideshow and reference in README
edwardhartnett Apr 2, 2021
61b15cd
merged develop
edwardhartnett Apr 7, 2021
22de884
merged
edwardhartnett Apr 13, 2021
c229c3b
merged
edwardhartnett Apr 16, 2021
c00c739
merged
edwardhartnett Apr 19, 2021
1f86f19
merged
edwardhartnett Apr 20, 2021
2fa10dd
merged
edwardhartnett Apr 20, 2021
e22a8fc
merged develop
edwardhartnett Apr 23, 2021
bcfbe9c
merged
edwardhartnett Apr 27, 2021
05390e7
merged upstream
edwardhartnett Apr 27, 2021
7a89788
merged upstream
edwardhartnett Apr 28, 2021
c2c324e
merged upstream
edwardhartnett Apr 28, 2021
795fe4c
merged upstream
edwardhartnett Apr 29, 2021
0a5dd0e
added utility name to test names in cmake output
edwardhartnett Apr 29, 2021
3810113
Merge branch 'develop' into ejh_test_name
edwardhartnett Apr 29, 2021
c6530cf
Merge branch 'develop' into ejh_test_name
edwardhartnett Apr 29, 2021
f4dc473
Merge branch 'develop' into ejh_test_name
edwardhartnett Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions tests/chgres_cube/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,42 +29,37 @@ execute_process( COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/config_spectral_sigio.nml ${CMAKE_CURRENT_BINARY_DIR}/config_spectral_sigio.nml)

add_executable(ftst_utils ftst_utils.F90)
add_test(NAME ftst_utils COMMAND ftst_utils)
target_link_libraries(ftst_utils
chgres_cube_lib)
add_test(NAME chgres_cube-ftst_utils COMMAND ftst_utils)
target_link_libraries(ftst_utils chgres_cube_lib)

add_executable(ftst_program_setup ftst_program_setup.F90)
target_link_libraries(ftst_program_setup
chgres_cube_lib)
target_link_libraries(ftst_program_setup chgres_cube_lib)

# Cause test to be run with MPI.
add_mpi_test(ftst_program_setup
add_mpi_test(chgres_cube-ftst_program_setup
EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/ftst_program_setup
NUMPROCS 4
TIMEOUT 60)

add_executable(ftst_search_util ftst_search_util.F90)
target_link_libraries(
ftst_search_util
chgres_cube_lib)
target_link_libraries(ftst_search_util chgres_cube_lib)

if(OpenMP_Fortran_FOUND)
target_link_libraries(ftst_search_util OpenMP::OpenMP_Fortran)
endif()

# Cause test to be run with MPI. The search routine was
# written to work on a single task. So set NUMPROCS to 1.
add_mpi_test(ftst_search_util
add_mpi_test(chgres_cube-ftst_search_util
EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/ftst_search_util
NUMPROCS 1
TIMEOUT 60)

add_executable(ftst_sfc_input_data ftst_sfc_input_data.F90)
target_link_libraries(ftst_sfc_input_data
chgres_cube_lib)
target_link_libraries(ftst_sfc_input_data chgres_cube_lib)

# Cause test to be run with MPI.
add_mpi_test(ftst_sfc_input_data
add_mpi_test(chgres_cube-ftst_sfc_input_data
EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/ftst_sfc_input_data
NUMPROCS 4
TIMEOUT 60)
2 changes: 1 addition & 1 deletion tests/fre-nctools/shared_lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
include_directories(${CMAKE_SOURCE_DIR}/sorc/fre-nctools.fd/shared_lib)

add_executable(tst_create_xgrid tst_create_xgrid.c)
add_test(NAME tst_create_xgrid COMMAND tst_create_xgrid)
add_test(NAME fre-nctools-tst_create_xgrid COMMAND tst_create_xgrid)
target_link_libraries(tst_create_xgrid NetCDF::NetCDF_C shared_lib m)


Expand Down