From f7e34b5788cb048602f1c83bea02ccbf7827eda7 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Fri, 25 Oct 2024 19:08:40 -0400 Subject: [PATCH] ci(msan): fine tune test timeouts --- scripts/ci/cmake/ci-fedora-msan.cmake | 7 +++++++ scripts/dashboard/common.cmake | 4 ++-- testing/adios2/engine/dataman/CMakeLists.txt | 8 ++++++++ testing/adios2/engine/staging-common/TestSupp.cmake | 5 +++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/ci/cmake/ci-fedora-msan.cmake b/scripts/ci/cmake/ci-fedora-msan.cmake index 6173be3ec8..a901eba138 100644 --- a/scripts/ci/cmake/ci-fedora-msan.cmake +++ b/scripts/ci/cmake/ci-fedora-msan.cmake @@ -19,6 +19,13 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_BUILD_FLAGS "-k -j4") set(CTEST_MEMORYCHECK_TYPE "MemorySanitizer") +list(APPEND EXCLUDE_EXPRESSIONS + "Engine.BP.BPBufferSizeTest.SyncDeferredIdenticalUsage.BP3.Serial" + "Engine.BP.BPBufferSizeTest.SyncDeferredIdenticalUsage.BP4.Serial" + ) +list(JOIN EXCLUDE_EXPRESSIONS "|" TEST_EXCLUDE_STRING) +set(CTEST_MEMCHECK_ARGS EXCLUDE "${TEST_EXCLUDE_STRING}") + set(ADIOS_TEST_REPEAT 0) list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}") include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake) diff --git a/scripts/dashboard/common.cmake b/scripts/dashboard/common.cmake index cbdeb4f101..265b5c89e9 100644 --- a/scripts/dashboard/common.cmake +++ b/scripts/dashboard/common.cmake @@ -489,8 +489,8 @@ if(dashboard_do_memcheck) if(COMMAND dashboard_hook_memcheck) dashboard_hook_memcheck() endif() - message("Calling ctest_memcheck") - ctest_memcheck(RETURN_VALUE MEMCHECK_RETURN DEFECT_COUNT MEMCHECK_DEFECTS) + message("Calling ctest_memcheck with CTEST_MEMCHECK_ARGS: " ${CTEST_MEMCHECK_ARGS}) + ctest_memcheck(${CTEST_MEMCHECK_ARGS} RETURN_VALUE MEMCHECK_RETURN DEFECT_COUNT MEMCHECK_DEFECTS) if(NOT (MEMCHECK_DEFECTS EQUAL 0)) message(SEND_ERROR "ctest memcheck defects found: ${MEMCHECK_DEFECTS}") endif() diff --git a/testing/adios2/engine/dataman/CMakeLists.txt b/testing/adios2/engine/dataman/CMakeLists.txt index 812649cc21..135417e346 100644 --- a/testing/adios2/engine/dataman/CMakeLists.txt +++ b/testing/adios2/engine/dataman/CMakeLists.txt @@ -17,6 +17,14 @@ foreach(tst IN ITEMS ) endforeach() +set_property(TEST Engine.DataMan.DataManEngineTest.1D.Serial PROPERTY TIMEOUT 300) +set_property(TEST Engine.DataMan.DataManEngineTest.2D_MemSelect.Serial PROPERTY TIMEOUT 300) +set_property(TEST Engine.DataMan.DataManEngineTest.3D_MemSelect.Serial PROPERTY TIMEOUT 300) +set_property(TEST Engine.DataMan.DataManEngineTest.WriterSingleBuffer.Serial PROPERTY TIMEOUT 300) +set_property(TEST Engine.DataMan.DataManEngineTest.WriterDoubleBuffer.Serial PROPERTY TIMEOUT 300) +set_property(TEST Engine.DataMan.DataManEngineTest.ReaderSingleBuffer.Serial PROPERTY TIMEOUT 300) +set_property(TEST Engine.DataMan.DataManEngineTest.ReaderDoubleBuffer.Serial PROPERTY TIMEOUT 300) + if (ADIOS2_HAVE_Python) python_add_test(NAME Test.Engine.DataMan1D.Serial SCRIPT TestDataMan1D.py) python_add_test(NAME Test.Engine.DataMan1xN.Serial SCRIPT TestDataMan1xN.py) diff --git a/testing/adios2/engine/staging-common/TestSupp.cmake b/testing/adios2/engine/staging-common/TestSupp.cmake index dcc9305093..9ce55b7d00 100644 --- a/testing/adios2/engine/staging-common/TestSupp.cmake +++ b/testing/adios2/engine/staging-common/TestSupp.cmake @@ -70,10 +70,10 @@ set (1x1GetSync_CMD "run_test.py.$ -nw 1 -nr 1 --rarg=--read_mode --rarg set (1x1DontCloseWriter_CMD "run_test.py.$ -nw 1 -nr 1 --warg=--dont_close") set (1x1DontCloseReader_CMD "run_test.py.$ -nw 1 -nr 1 --rarg=--dont_close") set (1x1DefSync_CMD "TestDefSyncWrite --data_size 200 --engine_params ChunkSize=500,MinDeferredSize=150") -set (1x1DefSync_TIMEOUT 180) +set (1x1DefSync_TIMEOUT 360) set (1x1VarDestruction_CMD "run_test.py.$ -nw 1 -nr 1 --rarg=--var_destruction") set (1x1DataWrite_CMD "TestDefSyncWrite --flush --data_size 200 --engine_params ChunkSize=500,MinDeferredSize=150") -set (1x1DataWrite_TIMEOUT 180) +set (1x1DataWrite_TIMEOUT 360) set (1x1.NoPreload_CMD "run_test.py.$ -nw 1 -nr 1 --rarg=PreloadMode=SstPreloadNone,RENGINE_PARAMS") set (1x1.SstRUDP_CMD "run_test.py.$ -nw 1 -nr 1 --rarg=DataTransport=WAN,WANDataTransport=enet,RENGINE_PARAMS --warg=DataTransport=WAN,WANDataTransport=enet,WENGINE_PARAMS") set (1x1.NoData_CMD "run_test.py.$ -nw 1 -nr 1 --warg=--no_data --rarg=--no_data") @@ -99,6 +99,7 @@ set (5x3_CMD "run_test.py.$ -nw 5 -nr 3") set (5x3DontClose_CMD "run_test.py.$ -nw 5 -nr 3 --rarg=--dont_close --warg=--dont_close") set (1x1.Local_CMD "run_test.py.$ -nw 1 -nr 1 -w $ -r $") set (1x1.Local2_CMD "run_test.py.$ -nw 1 -nr 1 -w $ -r $") +set (1x1.Local2_TIMEOUT 180) set (1x1.SpanMinMax_CMD "run_test.py.$ -nw 1 -nr 1 -w $ -r $") set (2x1.Local_CMD "run_test.py.$ -nw 2 -nr 1 -w $ -r $") set (1x2.Local_CMD "run_test.py.$ -nw 1 -nr 2 -w $ -r $")