From 668c1267c8dc6ebf4d2b4182daa9c612db3cecab Mon Sep 17 00:00:00 2001 From: Greg Eisenhauer Date: Mon, 25 May 2020 12:54:27 -0400 Subject: [PATCH 1/2] Restore Lock Geometry Test for SST, add 1x1 version --- testing/adios2/engine/staging-common/CMakeLists.txt | 5 +---- testing/adios2/engine/staging-common/TestSupp.cmake | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/testing/adios2/engine/staging-common/CMakeLists.txt b/testing/adios2/engine/staging-common/CMakeLists.txt index 50ae19c7ee..a5ca64e117 100644 --- a/testing/adios2/engine/staging-common/CMakeLists.txt +++ b/testing/adios2/engine/staging-common/CMakeLists.txt @@ -98,7 +98,7 @@ if(ADIOS2_HAVE_Fortran) set (SIMPLE_FORTRAN_TESTS "FtoC.1x1;CtoF.1x1;FtoF.1x1") endif() -set (SPECIAL_TESTS "TimeoutReader.1x1;LatestReader.1x1;LatestReaderHold.1x1;DiscardWriter.1x1;1x1.NoPreload;1x1.ForcePreload") +set (SPECIAL_TESTS "TimeoutReader.1x1;LatestReader.1x1;LatestReaderHold.1x1;DiscardWriter.1x1;1x1.NoPreload;1x1.ForcePreload;1x1LockGeometry") if (MPIEXEC_IS_BINARY) # run_test.py can only kill readers/writers if mpiexec is not a shell script list(APPEND SPECIAL_TESTS "KillReadersSerialized.3x2;KillReaders3Max.3x6;KillWriter_2x2;KillWriterTimeout_2x2") @@ -147,9 +147,6 @@ LIST (APPEND SST_TESTS ${FFS_SST_TESTS} ${BP_SST_TESTS}) # Zero Data tests are unreliable with SST and BP marshaling list (FILTER SST_TESTS EXCLUDE REGEX "2x1ZeroData.*BP") -# Temporarily exclude SST LockGeometry tests -list (FILTER SST_TESTS EXCLUDE REGEX "LockGeometry") - foreach(test ${SST_TESTS}) add_common_test(${test} SST) endforeach() diff --git a/testing/adios2/engine/staging-common/TestSupp.cmake b/testing/adios2/engine/staging-common/TestSupp.cmake index 01f78e4c16..bb24cc2e19 100644 --- a/testing/adios2/engine/staging-common/TestSupp.cmake +++ b/testing/adios2/engine/staging-common/TestSupp.cmake @@ -69,7 +69,7 @@ set (2x2.NoData_CMD "run_test.py.$ -nw 2 -nr 2 --warg=--no_data --rarg=- set (2x2.HalfNoData_CMD "run_test.py.$ -nw 2 -nr 2 --warg=--no_data --warg=--no_data_node --warg=1 --rarg=--no_data --rarg=--no_data_node --rarg=1" ) set (1x1.ForcePreload_CMD "run_test.py.$ -nw 1 -nr 1 --rarg=PreloadMode=SstPreloadOn,RENGINE_PARAMS") set (1x1Bulk_CMD "run_test.py.$ -nw 1 -nr 1 --warg=--nx --warg=10000 --warg=--num_steps --warg=101 --rarg=--num_steps --rarg=101") -set (1x1BulkLockGeometry_CMD "run_test.py.$ -nw 1 -nr 1 --warg=--num_steps --warg=101 --warg=--nx --warg=10000 --rarg=--num_steps --rarg=101 --warg=--lock_geometry --rarg=--lock_geometry") +set (1x1LockGeometry_CMD "run_test.py.$ -nw 1 -nr 1 --warg=--num_steps --warg=101 --warg=--nx --warg=50 --rarg=--num_steps --rarg=101 --warg=--lock_geometry --rarg=--lock_geometry --rarg=PreloadMode=SstPreloadNone,RENGINE_PARAMS") set (2x1_CMD "run_test.py.$ -nw 2 -nr 1") set (2x1ZeroDataVar_CMD "run_test.py.$ -nw 2 -nr 1 --warg=--zero_data_var") set (2x1ZeroDataR64_CMD "run_test.py.$ -nw 2 -nr 1 -r $ --warg=--zero_data_var") From a5834151ecffbb282f7f9afcdca30a683c2ba3c1 Mon Sep 17 00:00:00 2001 From: Greg Eisenhauer Date: Wed, 27 May 2020 08:19:32 -0400 Subject: [PATCH 2/2] Properly remove BP4_stream LocalVarying test --- testing/adios2/engine/staging-common/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/adios2/engine/staging-common/CMakeLists.txt b/testing/adios2/engine/staging-common/CMakeLists.txt index a5ca64e117..296a998f62 100644 --- a/testing/adios2/engine/staging-common/CMakeLists.txt +++ b/testing/adios2/engine/staging-common/CMakeLists.txt @@ -243,7 +243,7 @@ if(NOT MSVC) # not on windows # Fortran scalar reads don't work for BP4 streaming list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX "(FtoF|CtoF).*") # Local Vars have a heisen failure for BP4 streaming - list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*LocalVarying$") + list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*LocalVarying.BPS$") # The nobody-writes-data-in-a-timestep tests don't work for any BP file engine list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*NoData.BPS$")