Skip to content
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

Jump to bottom

Attempting to fix distributed test runs #1141

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Attempting to fix distributed test runs #1141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 39 additions & 39 deletions cmake/Phylanx_AddTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ macro(add_phylanx_test category name)
set(${name}_EXECUTABLE ${name})
endif()

if(TARGET ${${name}_EXECUTABLE}_test_exe)
set(_exe "$<TARGET_FILE:${${name}_EXECUTABLE}_test_exe>")
if(TARGET ${${name}_EXECUTABLE}_test)
set(_exe "$<TARGET_FILE:${${name}_EXECUTABLE}_test>")
else()
set(_exe "${${name}_EXECUTABLE}")
endif()
Expand Down Expand Up @@ -55,50 +55,50 @@ macro(add_phylanx_test category name)
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set_tests_properties("${category}.${name}" PROPERTIES TIMEOUT 200)
endif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
else()
if(HPX_WITH_PARCELPORT_MPI)
set(_add_test FALSE)
if(DEFINED ${name}_PARCELPORTS)
set(PP_FOUND -1)
list(FIND ${name}_PARCELPORTS "mpi" PP_FOUND)
if(NOT PP_FOUND EQUAL -1)
set(_add_test TRUE)
endif()
else()
else()
if(HPX_WITH_PARCELPORT_MPI)
set(_add_test FALSE)
if(DEFINED ${name}_PARCELPORTS)
set(PP_FOUND -1)
list(FIND ${name}_PARCELPORTS "mpi" PP_FOUND)
if(NOT PP_FOUND EQUAL -1)
set(_add_test TRUE)
endif()
if(_add_test)
add_test(
NAME "${category}.distributed.mpi.${name}"
COMMAND ${cmd} "-p" "mpi" "-r" "mpi" ${args})
# The debug tests can take longer than 100 seconds - so double the timeout.
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set_tests_properties("${category}.distributed.mpi.${name}" PROPERTIES TIMEOUT 200)
endif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
endif()
else()
set(_add_test TRUE)
endif()
if(HPX_WITH_PARCELPORT_TCP)
set(_add_test FALSE)
if(DEFINED ${name}_PARCELPORTS)
set(PP_FOUND -1)
list(FIND ${name}_PARCELPORTS "tcp" PP_FOUND)
if(NOT PP_FOUND EQUAL -1)
set(_add_test TRUE)
endif()
else()
if(_add_test)
add_test(
NAME "${category}.distributed.mpi.${name}"
COMMAND ${cmd} "-p" "mpi" "-r" "mpi" ${args})
# The debug tests can take longer than 100 seconds - so double the timeout.
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set_tests_properties("${category}.distributed.mpi.${name}" PROPERTIES TIMEOUT 200)
endif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
endif()
endif()
if(HPX_WITH_PARCELPORT_TCP)
set(_add_test FALSE)
if(DEFINED ${name}_PARCELPORTS)
set(PP_FOUND -1)
list(FIND ${name}_PARCELPORTS "tcp" PP_FOUND)
if(NOT PP_FOUND EQUAL -1)
set(_add_test TRUE)
endif()
if(_add_test)
add_test(
NAME "${category}.distributed.tcp.${name}"
COMMAND ${cmd} "-p" "tcp" ${args})
# The debug tests can take longer than 100 seconds - so double the timeout.
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set_tests_properties("${category}.distributed.tcp.${name}" PROPERTIES TIMEOUT 200)
endif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
endif()
else()
set(_add_test TRUE)
endif()
if(_add_test)
add_test(
NAME "${category}.distributed.tcp.${name}"
COMMAND ${cmd} "-p" "tcp" ${args})
# The debug tests can take longer than 100 seconds - so double the timeout.
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set_tests_properties("${category}.distributed.tcp.${name}" PROPERTIES TIMEOUT 200)
endif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
endif()
endif()
endif()
endmacro()

macro(add_phylanx_unit_test category name)
Expand Down