Commit 5c54edec authored by Ramon Nou's avatar Ramon Nou
Browse files

Updates for testing cargo

parent 9150948e

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ find_package(RedisPlusPlus 1.3.3 REQUIRED) 


### Cargo: required for transferring datasets between storage tiers

message(STATUS "[${PROJECT_NAME}] Checking for Cargo")

find_package(Cargo 0.2.0 REQUIRED)

find_package(Cargo 0.3.1 REQUIRED)





# ##############################################################################

examples/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ if(SCORD_BUILD_TESTS) 


  add_test(start_cargo

    ${CMAKE_SOURCE_DIR}/scripts/runner.sh start cargo.pid

           mpirun --allow-run-as-root -n 2 ${CARGO_BIN_INSTALL_DIR}/cargo -l ${CARGO_ADDRESS_STRING}

           mpirun --allow-run-as-root -n 2 ${CARGO_BIN_INSTALL_DIR}/cargo -l ${DATA_STAGER_ADDRESS_STRING} -o ${TEST_DIRECTORY}/cargo.log

  )

  set_tests_properties(start_cargo

    PROPERTIES FIXTURES_SETUP cargo)

examples/c/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ if(SCORD_BUILD_TESTS) 
    add_test(run_${TEST_NAME} ${example}

      ${SCORD_ADDRESS_STRING}

      ${SCORD_CTL_ADDRESS_STRING}

      $(DATA_STAGER_ADDRESS_STRING))

      ${DATA_STAGER_ADDRESS_STRING})

    set_tests_properties(run_${TEST_NAME}

      PROPERTIES FIXTURES_REQUIRED "scord_daemon;scord_ctl;cargo"

      ENVIRONMENT "${TEST_ENV}")

examples/cxx/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ if(SCORD_BUILD_TESTS) 
    add_test(run_${TEST_NAME} ${example}

      ${SCORD_ADDRESS_STRING}

      ${SCORD_CTL_ADDRESS_STRING}

      $(DATA_STAGER_ADDRESS_STRING))

      ${DATA_STAGER_ADDRESS_STRING})

    set_tests_properties(run_${TEST_NAME}

      PROPERTIES FIXTURES_REQUIRED "scord_daemon;scord_ctl"

      ENVIRONMENT "${TEST_ENV}")