Skip to content

Commit 652ca48

Browse files
Fix set_tests_properties() not finding MPI tests
Previously set_tests_properties() would fail because it couldn't find fiat_test_drhook_papi_mpi_valid_csv to add properties to. This was because fiat_test_drhook_papi_mpi_valid_csv was behind a condition that required MPI, while set_tests_properties() was not.
1 parent b93a1f3 commit 652ca48

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

tests/drhook/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ if (HAVE_DR_HOOK_NVTX)
8686
add_subdirectory(drhook_nvtx)
8787
endif ()
8888

89-
# PAPI
90-
if (HAVE_DR_HOOK_PAPI)
91-
add_subdirectory(drhook_papi)
92-
endif ()
89+
# PAPI
90+
if (HAVE_DR_HOOK_PAPI)
91+
add_subdirectory(drhook_papi)
92+
endif ()

tests/drhook/drhook_papi/CMakeLists.txt

+5-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,11 @@ ecbuild_add_test( TARGET fiat_test_drhook_papi_mpi_valid_csv
6464
ENVIRONMENT DR_HOOK=1 DR_HOOK_OPT=COUNTERS
6565
CONDITION HAVE_DR_HOOK_PAPI AND HAVE_MPI )
6666

67-
set_tests_properties(fiat_test_drhook_papi_mpi_valid_csv
68-
PROPERTIES DEPENDS fiat_test_drhook_papi_mpi
69-
PASS_REGULAR_EXPRESSION "5" )
67+
if (HAVE_MPI)
68+
set_tests_properties(fiat_test_drhook_papi_mpi_valid_csv
69+
PROPERTIES DEPENDS fiat_test_drhook_papi_mpi
70+
PASS_REGULAR_EXPRESSION "5" )
71+
endif()
7072

7173
# Test user specified output file names
7274

0 commit comments

Comments
 (0)