Merge branch 'master' into openshmem-parcelport

STEllAR-GROUP · Dec 2, 2023 · e6c317c · e6c317c
2 parents 548d361 + 5ffdfbe
commit e6c317c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/.jenkins/lsu/env-clang-14.sh b/.jenkins/lsu/env-clang-14.sh
@@ -29,15 +29,8 @@ configure_extra_options+=" -DCMAKE_C_COMPILER=clang"
 configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
 configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON"
 configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
-configure_extra_options+=" -DHPX_WITH_PARCELPORT_OPENSHMEM=ON"
 configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp"
-configure_extra_options+=" -DHPX_WITH_PARCELPORT_OPENSHMEM_CONDUIT=mpi"
-configure_extra_options+=" -DCMAKE_C_COMPILER=clang"
-configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
-configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON"
-configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
 configure_extra_options+=" -DHPX_WITH_PARCELPORT_OPENSHMEM=ON"
-configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp"
 configure_extra_options+=" -DHPX_WITH_PARCELPORT_OPENSHMEM_CONDUIT=mpi"
 configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
 configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"

diff --git a/cmake/HPX_AddTest.cmake b/cmake/HPX_AddTest.cmake
@@ -233,7 +233,6 @@ function(add_hpx_test category name)
         add_test(NAME "${_full_name}" COMMAND ${cmd} "-p" "openshmem" "-r"
                                               "openshmem" ${args}
         )
-        set_tests_properties("${_full_name}" PROPERTIES RUN_SERIAL TRUE)
         if(${name}_TIMEOUT)
           set_tests_properties(
             "${_full_name}" PROPERTIES TIMEOUT ${${name}_TIMEOUT}