From 437c48c104437c4f7d64809c0e6a155eff417f35 Mon Sep 17 00:00:00 2001 From: lukemartinlogan Date: Sun, 22 Dec 2024 11:47:57 -0600 Subject: [PATCH] Always install tests --- .../unit/hermes_adapters/mpiio/CMakeLists.txt | 52 ++++---- .../unit/hermes_adapters/posix/CMakeLists.txt | 20 ++- .../unit/hermes_adapters/stdio/CMakeLists.txt | 126 +++++++++--------- test/unit/pipelines/hermes/test_hermes.yaml | 1 - .../mpiio/test_hermes_mpiio_basic_async.yaml | 7 +- .../mpiio/test_hermes_mpiio_basic_sync.yaml | 7 +- .../posix/test_hermes_posix_basic_large.yaml | 7 +- .../test_hermes_posix_basic_mpi_large.yaml | 7 +- .../test_hermes_posix_basic_mpi_small.yaml | 7 +- .../posix/test_hermes_posix_basic_small.yaml | 7 +- .../test_hermes_posix_simple_io_omp.yaml | 7 +- .../test_hermes_stdio_adapter_bypass.yaml | 7 +- .../test_hermes_stdio_adapter_default.yaml | 7 +- .../test_hermes_stdio_adapter_scratch.yaml | 7 +- .../stdio/test_hermes_stdio_basic_large.yaml | 7 +- .../test_hermes_stdio_basic_mpi_large.yaml | 7 +- .../test_hermes_stdio_basic_mpi_small.yaml | 7 +- .../stdio/test_hermes_stdio_basic_small.yaml | 7 +- .../stdio/test_hermes_stdio_low_buf.yaml | 7 +- .../stdio/test_hermes_stdio_mapper.yaml | 7 +- .../pipelines/vfd/test_hermes_vfd_basic.yaml | 7 +- .../pipelines/vfd/test_hermes_vfd_python.yaml | 7 +- .../vfd/test_hermes_vfd_scratch.yaml | 7 +- 23 files changed, 210 insertions(+), 122 deletions(-) diff --git a/test/unit/hermes_adapters/mpiio/CMakeLists.txt b/test/unit/hermes_adapters/mpiio/CMakeLists.txt index 18b8ea07a..dcad16edc 100644 --- a/test/unit/hermes_adapters/mpiio/CMakeLists.txt +++ b/test/unit/hermes_adapters/mpiio/CMakeLists.txt @@ -1,25 +1,25 @@ # MPI adapter tests without hermes add_executable(mpiio_adapter_test - mpiio_adapter_test.cc - mpiio_adapter_basic_test.cc) + mpiio_adapter_test.cc + mpiio_adapter_basic_test.cc) target_link_libraries(mpiio_adapter_test - hermes_client) + hermes_client) add_dependencies(mpiio_adapter_test - hermes_client) + hermes_client) target_compile_definitions(mpiio_adapter_test PUBLIC - HERMES_MPI_TESTS=true) + HERMES_MPI_TESTS=true) jarvis_test(mpiio test_mpiio_basic) # MPI adapter tests with hermes add_executable(hermes_mpiio_adapter_test - mpiio_adapter_test.cc - mpiio_adapter_basic_test.cc) + mpiio_adapter_test.cc + mpiio_adapter_basic_test.cc) target_link_libraries(hermes_mpiio_adapter_test - hermes_mpiio) + hermes_mpiio) add_dependencies(hermes_mpiio_adapter_test - hermes_mpiio) + hermes_mpiio) target_compile_definitions(hermes_mpiio_adapter_test PUBLIC - HERMES_INTERCEPT=1 HERMES_MPI_TESTS=true) + HERMES_INTERCEPT=1 HERMES_MPI_TESTS=true) jarvis_test(mpiio test_hermes_mpiio_basic_sync) jarvis_test(mpiio test_hermes_mpiio_basic_async) @@ -34,27 +34,25 @@ foreach(program ${MPIIO_TESTS}) target_link_libraries(${program} Catch2::Catch2 -lstdc++fs -lc MPI::MPI_CXX) endforeach() -if(HERMES_INSTALL_TESTS) - foreach(program ${MPIIO_TESTS}) - install( - TARGETS - ${program} - LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR} - ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR} - RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR} - ) - endforeach() -endif() +foreach(program ${MPIIO_TESTS}) + install( + TARGETS + ${program} + LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR} + ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR} + RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR} + ) +endforeach() add_executable(mpi_parallel parallel.cc) add_dependencies(mpi_parallel hermes_mpiio) -target_link_libraries(mpi_parallel hermes_mpiio Catch2::Catch2 -lstdc++fs -lc MPI::MPI_CXX) +target_link_libraries(mpi_parallel hermes_mpiio Catch2::Catch2 -lstdc++fs -lc MPI::MPI_CXX) set_target_properties(mpi_parallel PROPERTIES COMPILE_FLAGS "-DHERMES_INTERCEPT=1") install( - TARGETS - mpi_parallel - LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR} - ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR} - RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR} + TARGETS + mpi_parallel + LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR} + ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR} + RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR} ) \ No newline at end of file diff --git a/test/unit/hermes_adapters/posix/CMakeLists.txt b/test/unit/hermes_adapters/posix/CMakeLists.txt index 110615428..357318c32 100644 --- a/test/unit/hermes_adapters/posix/CMakeLists.txt +++ b/test/unit/hermes_adapters/posix/CMakeLists.txt @@ -96,14 +96,12 @@ foreach(program ${POSIX_TESTS}) MPI::MPI_CXX OpenMP::OpenMP_CXX) endforeach() -if(HERMES_INSTALL_TESTS) - foreach(program ${POSIX_TESTS}) - install( - TARGETS - ${program} - LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR} - ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR} - RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR} - ) - endforeach() -endif() +foreach(program ${POSIX_TESTS}) + install( + TARGETS + ${program} + LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR} + ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR} + RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR} + ) +endforeach() \ No newline at end of file diff --git a/test/unit/hermes_adapters/stdio/CMakeLists.txt b/test/unit/hermes_adapters/stdio/CMakeLists.txt index 8ecabcaff..5d0ab0415 100644 --- a/test/unit/hermes_adapters/stdio/CMakeLists.txt +++ b/test/unit/hermes_adapters/stdio/CMakeLists.txt @@ -1,113 +1,113 @@ include_directories( - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/src) + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src) -#------------------------------------------------------------------------------ +# ------------------------------------------------------------------------------ # STDIO Adapter Internal tests -#------------------------------------------------------------------------------ +# ------------------------------------------------------------------------------ add_executable(hermes_stdio_adapter_mapper_test - stdio_adapter_test.cc - stdio_adapter_mapper_test.cc) + stdio_adapter_test.cc + stdio_adapter_mapper_test.cc) add_dependencies(hermes_stdio_adapter_mapper_test - hermes_stdio) + hermes_stdio) target_link_libraries(hermes_stdio_adapter_mapper_test - hermes_stdio) + hermes_stdio) target_compile_definitions(hermes_stdio_adapter_mapper_test PUBLIC - HERMES_INTERCEPT=1 HERMES_MPI_TESTS=false) + HERMES_INTERCEPT=1 HERMES_MPI_TESTS=false) jarvis_test(stdio test_hermes_stdio_mapper) -#------------------------------------------------------------------------------ +# ------------------------------------------------------------------------------ # STDIO Adapter End to End tests -#------------------------------------------------------------------------------ +# ------------------------------------------------------------------------------ # Non-Hermes, None-MPI STDIO basic add_executable(stdio_adapter_test - stdio_adapter_test.cc - stdio_adapter_basic_test.cc - stdio_adapter_func_test.cc - stdio_adapter_rs_test.cc) + stdio_adapter_test.cc + stdio_adapter_basic_test.cc + stdio_adapter_func_test.cc + stdio_adapter_rs_test.cc) add_dependencies(stdio_adapter_test - hermes_client) + hermes_client) target_link_libraries(stdio_adapter_test - hermes_client) + hermes_client) target_compile_definitions(stdio_adapter_test PUBLIC - HERMES_MPI_TESTS=false) + HERMES_MPI_TESTS=false) jarvis_test(stdio test_stdio_basic) # Hermes, None-MPI STDIO basic add_executable(hermes_stdio_adapter_test - stdio_adapter_test.cc - stdio_adapter_basic_test.cc - stdio_adapter_rs_test.cc) + stdio_adapter_test.cc + stdio_adapter_basic_test.cc + stdio_adapter_rs_test.cc) add_dependencies(hermes_stdio_adapter_test - hermes_stdio) + hermes_stdio) target_link_libraries(hermes_stdio_adapter_test - hermes_stdio) + hermes_stdio) target_compile_definitions(hermes_stdio_adapter_test PUBLIC - HERMES_INTERCEPT=1 HERMES_MPI_TESTS=false) + HERMES_INTERCEPT=1 HERMES_MPI_TESTS=false) jarvis_test(stdio test_hermes_stdio_basic_small) jarvis_test(stdio test_hermes_stdio_basic_large) # Non-Hermes, MPI STDIO basic add_executable(stdio_adapter_mpi_test - stdio_adapter_test.cc - stdio_adapter_basic_test.cc - stdio_adapter_rs_test.cc - stdio_adapter_shared_test.cc) + stdio_adapter_test.cc + stdio_adapter_basic_test.cc + stdio_adapter_rs_test.cc + stdio_adapter_shared_test.cc) add_dependencies(stdio_adapter_mpi_test - hermes_client) + hermes_client) target_link_libraries(stdio_adapter_mpi_test - hermes_client) + hermes_client) target_compile_definitions(stdio_adapter_mpi_test PUBLIC - HERMES_MPI_TESTS=true) + HERMES_MPI_TESTS=true) jarvis_test(stdio test_stdio_basic_mpi) # Hermes, MPI STDIO basic add_executable(hermes_stdio_adapter_mpi_test - stdio_adapter_test.cc - stdio_adapter_basic_test.cc - stdio_adapter_rs_test.cc - stdio_adapter_shared_test.cc) + stdio_adapter_test.cc + stdio_adapter_basic_test.cc + stdio_adapter_rs_test.cc + stdio_adapter_shared_test.cc) target_link_libraries(hermes_stdio_adapter_mpi_test - hermes_stdio) + hermes_stdio) add_dependencies(hermes_stdio_adapter_mpi_test - hermes_stdio) + hermes_stdio) target_compile_definitions(hermes_stdio_adapter_mpi_test PUBLIC - HERMES_INTERCEPT=1 HERMES_MPI_TESTS=true) + HERMES_INTERCEPT=1 HERMES_MPI_TESTS=true) jarvis_test(stdio test_hermes_stdio_basic_mpi_small) jarvis_test(stdio test_hermes_stdio_basic_mpi_large) # Hermes, Low buffer space add_executable(hermes_stdio_low_buf_adapter_test - stdio_adapter_test.cc - stdio_adapter_low_buffer_space_test.cc) + stdio_adapter_test.cc + stdio_adapter_low_buffer_space_test.cc) target_link_libraries(hermes_stdio_low_buf_adapter_test hermes_stdio) add_dependencies(hermes_stdio_low_buf_adapter_test hermes_stdio) target_compile_definitions(hermes_stdio_low_buf_adapter_test PUBLIC - HERMES_INTERCEPT=1 HERMES_MPI_TESTS=false) + HERMES_INTERCEPT=1 HERMES_MPI_TESTS=false) jarvis_test(stdio test_hermes_stdio_low_buf) # Hermes, Adapter mode add_executable(hermes_stdio_adapter_mode_test - stdio_adapter_test.cc - stdio_adapter_mode_test.cc) + stdio_adapter_test.cc + stdio_adapter_mode_test.cc) target_link_libraries(hermes_stdio_adapter_mode_test - hermes_stdio) + hermes_stdio) add_dependencies(hermes_stdio_adapter_mode_test - hermes_stdio) + hermes_stdio) target_compile_definitions(hermes_stdio_adapter_mode_test PUBLIC - HERMES_INTERCEPT=1 HERMES_MPI_TESTS=false) + HERMES_INTERCEPT=1 HERMES_MPI_TESTS=false) jarvis_test(stdio test_hermes_stdio_adapter_bypass) jarvis_test(stdio test_hermes_stdio_adapter_default) jarvis_test(stdio test_hermes_stdio_adapter_scratch) set(STDIO_TESTS - stdio_adapter_test - hermes_stdio_adapter_test - hermes_stdio_low_buf_adapter_test - hermes_stdio_adapter_mapper_test - hermes_stdio_adapter_mode_test - stdio_adapter_mpi_test - hermes_stdio_adapter_mpi_test + stdio_adapter_test + hermes_stdio_adapter_test + hermes_stdio_low_buf_adapter_test + hermes_stdio_adapter_mapper_test + hermes_stdio_adapter_mode_test + stdio_adapter_mpi_test + hermes_stdio_adapter_mpi_test ) foreach(program ${STDIO_TESTS}) @@ -116,14 +116,12 @@ foreach(program ${STDIO_TESTS}) target_link_libraries(${program} Catch2::Catch2 -lstdc++fs -lc MPI::MPI_CXX) endforeach() -if(HERMES_INSTALL_TESTS) - foreach(program ${STDIO_TESTS}) - install( - TARGETS - ${program} - LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR} - ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR} - RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR} - ) - endforeach() -endif() +foreach(program ${STDIO_TESTS}) + install( + TARGETS + ${program} + LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR} + ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR} + RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR} + ) +endforeach() diff --git a/test/unit/pipelines/hermes/test_hermes.yaml b/test/unit/pipelines/hermes/test_hermes.yaml index c39c6a4ad..94d8664f1 100644 --- a/test/unit/pipelines/hermes/test_hermes.yaml +++ b/test/unit/pipelines/hermes/test_hermes.yaml @@ -7,7 +7,6 @@ pkgs: do_dbg: true dbg_port: 4000 modules: ['hermes_core'] - worker_cpus: [0, 1, 1] - pkg_type: hermes_run pkg_name: hermes_run do_dbg: true diff --git a/test/unit/pipelines/mpiio/test_hermes_mpiio_basic_async.yaml b/test/unit/pipelines/mpiio/test_hermes_mpiio_basic_async.yaml index 2e3635c6c..0cc77462c 100644 --- a/test/unit/pipelines/mpiio/test_hermes_mpiio_basic_async.yaml +++ b/test/unit/pipelines/mpiio/test_hermes_mpiio_basic_async.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_mpiio_basic_large env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 5 - pkg_type: hermes_mpiio_tests pkg_name: hermes_mpiio_tests test_file: mpiio_basic diff --git a/test/unit/pipelines/mpiio/test_hermes_mpiio_basic_sync.yaml b/test/unit/pipelines/mpiio/test_hermes_mpiio_basic_sync.yaml index ba639d2ff..3975ca6c5 100644 --- a/test/unit/pipelines/mpiio/test_hermes_mpiio_basic_sync.yaml +++ b/test/unit/pipelines/mpiio/test_hermes_mpiio_basic_sync.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_mpiio_basic_async env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_mpiio_tests pkg_name: hermes_mpiio_tests test_file: mpiio_basic diff --git a/test/unit/pipelines/posix/test_hermes_posix_basic_large.yaml b/test/unit/pipelines/posix/test_hermes_posix_basic_large.yaml index 8b95a425f..9e10ae191 100644 --- a/test/unit/pipelines/posix/test_hermes_posix_basic_large.yaml +++ b/test/unit/pipelines/posix/test_hermes_posix_basic_large.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_posix_basic_large env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 5 - pkg_type: hermes_posix_tests pkg_name: hermes_posix_tests test_file: posix_basic diff --git a/test/unit/pipelines/posix/test_hermes_posix_basic_mpi_large.yaml b/test/unit/pipelines/posix/test_hermes_posix_basic_mpi_large.yaml index 51a6f4d46..7a7c609a0 100644 --- a/test/unit/pipelines/posix/test_hermes_posix_basic_mpi_large.yaml +++ b/test/unit/pipelines/posix/test_hermes_posix_basic_mpi_large.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_posix_basic_mpi_large env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_posix_tests pkg_name: hermes_posix_tests test_file: posix_basic_mpi diff --git a/test/unit/pipelines/posix/test_hermes_posix_basic_mpi_small.yaml b/test/unit/pipelines/posix/test_hermes_posix_basic_mpi_small.yaml index a461c79f2..bd2d47dbc 100644 --- a/test/unit/pipelines/posix/test_hermes_posix_basic_mpi_small.yaml +++ b/test/unit/pipelines/posix/test_hermes_posix_basic_mpi_small.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_posix_basic_mpi_small env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_posix_tests pkg_name: hermes_posix_tests test_file: posix_basic_mpi diff --git a/test/unit/pipelines/posix/test_hermes_posix_basic_small.yaml b/test/unit/pipelines/posix/test_hermes_posix_basic_small.yaml index 26f6b0f63..ebcf19c76 100644 --- a/test/unit/pipelines/posix/test_hermes_posix_basic_small.yaml +++ b/test/unit/pipelines/posix/test_hermes_posix_basic_small.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_posix_basic_small env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_posix_tests pkg_name: hermes_posix_tests test_file: posix_basic diff --git a/test/unit/pipelines/posix/test_hermes_posix_simple_io_omp.yaml b/test/unit/pipelines/posix/test_hermes_posix_simple_io_omp.yaml index 6a41a707b..e3da27f21 100644 --- a/test/unit/pipelines/posix/test_hermes_posix_simple_io_omp.yaml +++ b/test/unit/pipelines/posix/test_hermes_posix_simple_io_omp.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_posix_simple_io_omp env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_posix_tests pkg_name: hermes_posix_tests test_file: posix_simple_io_omp diff --git a/test/unit/pipelines/stdio/test_hermes_stdio_adapter_bypass.yaml b/test/unit/pipelines/stdio/test_hermes_stdio_adapter_bypass.yaml index f70b30757..b40ae03f0 100644 --- a/test/unit/pipelines/stdio/test_hermes_stdio_adapter_bypass.yaml +++ b/test/unit/pipelines/stdio/test_hermes_stdio_adapter_bypass.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_stdio_basic_small env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_stdio_tests pkg_name: hermes_stdio_tests test_file: stdio_adapter_mode diff --git a/test/unit/pipelines/stdio/test_hermes_stdio_adapter_default.yaml b/test/unit/pipelines/stdio/test_hermes_stdio_adapter_default.yaml index e8b56d196..86b294135 100644 --- a/test/unit/pipelines/stdio/test_hermes_stdio_adapter_default.yaml +++ b/test/unit/pipelines/stdio/test_hermes_stdio_adapter_default.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_stdio_basic_small env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_stdio_tests pkg_name: hermes_stdio_tests test_file: stdio_adapter_mode diff --git a/test/unit/pipelines/stdio/test_hermes_stdio_adapter_scratch.yaml b/test/unit/pipelines/stdio/test_hermes_stdio_adapter_scratch.yaml index c4fa8f3a3..688e22949 100644 --- a/test/unit/pipelines/stdio/test_hermes_stdio_adapter_scratch.yaml +++ b/test/unit/pipelines/stdio/test_hermes_stdio_adapter_scratch.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_stdio_basic_small env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_stdio_tests pkg_name: hermes_stdio_tests test_file: stdio_adapter_mode diff --git a/test/unit/pipelines/stdio/test_hermes_stdio_basic_large.yaml b/test/unit/pipelines/stdio/test_hermes_stdio_basic_large.yaml index c4972f1b1..811be862e 100644 --- a/test/unit/pipelines/stdio/test_hermes_stdio_basic_large.yaml +++ b/test/unit/pipelines/stdio/test_hermes_stdio_basic_large.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_stdio_basic_large env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_stdio_tests pkg_name: hermes_stdio_tests test_file: stdio_basic diff --git a/test/unit/pipelines/stdio/test_hermes_stdio_basic_mpi_large.yaml b/test/unit/pipelines/stdio/test_hermes_stdio_basic_mpi_large.yaml index 126926539..e6e8df3d3 100644 --- a/test/unit/pipelines/stdio/test_hermes_stdio_basic_mpi_large.yaml +++ b/test/unit/pipelines/stdio/test_hermes_stdio_basic_mpi_large.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_stdio_basic_mpi_large env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_stdio_tests pkg_name: hermes_stdio_tests test_file: stdio_basic_mpi diff --git a/test/unit/pipelines/stdio/test_hermes_stdio_basic_mpi_small.yaml b/test/unit/pipelines/stdio/test_hermes_stdio_basic_mpi_small.yaml index 24fce5ea9..d33d93960 100644 --- a/test/unit/pipelines/stdio/test_hermes_stdio_basic_mpi_small.yaml +++ b/test/unit/pipelines/stdio/test_hermes_stdio_basic_mpi_small.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_stdio_basic_mpi_small env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_stdio_tests pkg_name: hermes_stdio_tests test_file: stdio_basic_mpi diff --git a/test/unit/pipelines/stdio/test_hermes_stdio_basic_small.yaml b/test/unit/pipelines/stdio/test_hermes_stdio_basic_small.yaml index ae626a913..83ff0e89f 100644 --- a/test/unit/pipelines/stdio/test_hermes_stdio_basic_small.yaml +++ b/test/unit/pipelines/stdio/test_hermes_stdio_basic_small.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_stdio_basic_small env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_stdio_tests pkg_name: hermes_stdio_tests test_file: stdio_basic diff --git a/test/unit/pipelines/stdio/test_hermes_stdio_low_buf.yaml b/test/unit/pipelines/stdio/test_hermes_stdio_low_buf.yaml index 47036fbb5..48e22d83e 100644 --- a/test/unit/pipelines/stdio/test_hermes_stdio_low_buf.yaml +++ b/test/unit/pipelines/stdio/test_hermes_stdio_low_buf.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_stdio_basic_small env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_stdio_tests pkg_name: hermes_stdio_tests test_file: stdio_low_buf diff --git a/test/unit/pipelines/stdio/test_hermes_stdio_mapper.yaml b/test/unit/pipelines/stdio/test_hermes_stdio_mapper.yaml index 27259caa9..809a08616 100644 --- a/test/unit/pipelines/stdio/test_hermes_stdio_mapper.yaml +++ b/test/unit/pipelines/stdio/test_hermes_stdio_mapper.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_stdio_basic_small env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 2 - pkg_type: hermes_stdio_tests pkg_name: hermes_stdio_tests test_file: stdio_mapper diff --git a/test/unit/pipelines/vfd/test_hermes_vfd_basic.yaml b/test/unit/pipelines/vfd/test_hermes_vfd_basic.yaml index 5ddd84d05..5a8bb6804 100644 --- a/test/unit/pipelines/vfd/test_hermes_vfd_basic.yaml +++ b/test/unit/pipelines/vfd/test_hermes_vfd_basic.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_vfd_basic env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 5 - pkg_type: hermes_api pkg_name: hermes_api vfd: true diff --git a/test/unit/pipelines/vfd/test_hermes_vfd_python.yaml b/test/unit/pipelines/vfd/test_hermes_vfd_python.yaml index f87d650e2..699130a33 100644 --- a/test/unit/pipelines/vfd/test_hermes_vfd_python.yaml +++ b/test/unit/pipelines/vfd/test_hermes_vfd_python.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_vfd_basic env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 5 - pkg_type: hermes_api pkg_name: hermes_api vfd: true diff --git a/test/unit/pipelines/vfd/test_hermes_vfd_scratch.yaml b/test/unit/pipelines/vfd/test_hermes_vfd_scratch.yaml index 69cdcccc8..2191b7dd9 100644 --- a/test/unit/pipelines/vfd/test_hermes_vfd_scratch.yaml +++ b/test/unit/pipelines/vfd/test_hermes_vfd_scratch.yaml @@ -1,9 +1,14 @@ name: hermes_unit_hermes_vfd_basic env: hermes pkgs: + - pkg_type: chimaera_run + pkg_name: chimaera_run + sleep: 5 + do_dbg: false + dbg_port: 4000 + modules: ['hermes_core'] - pkg_type: hermes_run pkg_name: hermes_run - sleep: 5 - pkg_type: hermes_vfd_tests pkg_name: hermes_vfd_tests test_file: vfd_basic