Skip to content

Commit

Permalink
Merge pull request #1758 from eisenhauer/TestNameChanges
Browse files Browse the repository at this point in the history 
Test name changes
  • Loading branch information
@eisenhauer
eisenhauer authored Sep 18, 2019
2 parents 823adec + 9e0ad55 commit 04083b7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 29 deletions.
12 changes: 6 additions & 6 deletions testing/adios2/engine/staging-common/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,16 @@ if(ADIOS2_HAVE_MPI AND MPIEXEC_EXECUTABLE)
endforeach()
endif()

set (SIMPLE_TESTS "1x1;NoReaderNoWait;TimeoutOnOpen;Modes;1x1.Attrs;1x1.Local;1x1.SharedNothing;1x1.SharedIO;1x1.SharedVar;1x1.SharedNothingSync;1x1.SharedIOSync;1x1.SharedVarSync;2x1.SharedNothing;2x1.SharedIO;2x1.SharedVar;2x1.SharedNothingSync;2x1.SharedIOSync;2x1.SharedVarSync")
set (SIMPLE_TESTS "1x1;NoReaderNoWait;TimeoutOnOpen;1x1.Modes;1x1.Attrs;1x1.Local;1x1.SharedNothing;1x1.SharedIO;1x1.SharedVar;1x1.SharedNothingSync;1x1.SharedIOSync;1x1.SharedVarSync;2x1.SharedNothing;2x1.SharedIO;2x1.SharedVar;2x1.SharedNothingSync;2x1.SharedIOSync;2x1.SharedVarSync")
set (SIMPLE_FORTRAN_TESTS "")
if(ADIOS2_HAVE_Fortran)
set (SIMPLE_FORTRAN_TESTS "FtoC.1x1;CtoF.1x1;FtoF.1x1")
endif()

set (SPECIAL_TESTS "TimeoutReader;LatestReader;LatestReaderHold;DiscardWriter;PreciousTimestep;PreciousTimestepDiscard;1x1.NoPreload;1x1.ForcePreload")
set (SPECIAL_TESTS "TimeoutReader.1x1;LatestReader.1x1;LatestReaderHold.1x1;DiscardWriter.1x1;PreciousTimestep.3x2;PreciousTimestepDiscard.3x2;1x1.NoPreload;1x1.ForcePreload")
if (MPIEXEC_IS_BINARY)
# run_test.py can only kill readers/writers if mpiexec is not a shell script
list(APPEND SPECIAL_TESTS "KillReadersSerialized;KillReaders3Max;KillWriterTimeout_2x2")
list(APPEND SPECIAL_TESTS "KillReadersSerialized.3x2;KillReaders3Max.3x6;KillWriter_2x2;KillWriterTimeout_2x2")
endif()

set (SIMPLE_MPI_TESTS "")
Expand Down Expand Up @@ -200,7 +200,7 @@ endforeach()
if(ADIOS2_HAVE_MPI)
set (INSITU_TESTS ${ALL_SIMPLE_TESTS})
# Tests that don't work for InSitu
list (REMOVE_ITEM INSITU_TESTS "TimeoutOnOpen" "Modes" "1x1.Attrs")
list (REMOVE_ITEM INSITU_TESTS "TimeoutOnOpen" "1x1.Modes" "1x1.Attrs")
# Local Vars don't work for InSitu
list (FILTER INSITU_TESTS EXCLUDE REGEX ".*Local$")
# Multiple streams don't work for InSitu
Expand Down Expand Up @@ -251,11 +251,11 @@ if(NOT MSVC) # not on windows
# SharedVars fail with BP4_streaming*
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*SharedVar.BPS$")
# Discard not a feature of BP4
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*DiscardWriter.BPS$")
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*DiscardWriter.1x1.*BPS$")
# PreciousTimestep not a feature of BP4
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*Precious.*BPS$")
# Timeout on Reader BeginStep failing in BP4
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*TimeoutReader.BPS$")
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*TimeoutReader.1x1.*BPS$")
# LatestTimestep not a feature of BP4
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*LatestReader.*BPS$")
# Preload not a feature of BP4_streaming
Expand Down
39 changes: 16 additions & 23 deletions testing/adios2/engine/staging-common/TestSupp.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ set (1x1BulkLockGeometry_CMD "run_test.py -nw 1 -nr 1 --warg=--num_steps --warg
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 -w TestCommonWrite -r TestCommonReadR64 --warg=--zero_data_var")
set (2x1.NoPreload_CMD "run_test.py -nw 2 -nr 1 --rarg=PreloadMode=SstPreloadNone")
set (2x3.ForcePreload_CMD "run_test.py -nw 2 -nr 3 --rarg=PreloadMode=SstPreloadOn")
set (2x1.NoPreload_CMD "run_test.py -nw 2 -nr 1 --rarg=PreloadMode=SstPreloadNone,RENGINE_PARAMS")
set (2x3.ForcePreload_CMD "run_test.py -nw 2 -nr 3 --rarg=PreloadMode=SstPreloadOn,RENGINE_PARAMS")
set (1x2_CMD "run_test.py -nw 1 -nr 2")
set (3x5_CMD "run_test.py -nw 3 -nr 5")
set (3x5LockGeometry_CMD "run_test.py -nw 3 -nr 5 --warg=--num_steps --warg=100 --rarg=--num_steps --rarg=100 --warg=--lock_geometry --rarg=--lock_geometry")
Expand Down Expand Up @@ -103,7 +103,7 @@ set (NoReaderNoWait_CMD "run_test.py -nw 1 -nr 0 --warg=RendezvousReaderCount=0,
set (TimeoutOnOpen_CMD "run_test.py -nw 0 -nr 1 --rarg=--expect_timeout --rarg=OpenTimeoutSecs=10,RENGINE_PARAMS")

# The Modes test checks to see that we can mix and match Put Sync and Deferred modes and still get good data
set (Modes_CMD "run_test.py -nw 1 -nr 1 -w TestCommonWriteModes -r TestCommonRead")
set (1x1.Modes_CMD "run_test.py -nw 1 -nr 1 -w TestCommonWriteModes -r TestCommonRead")

# 1x1.Attrs tests writing and reading of attributes defined before Open
set (1x1.Attrs_CMD "run_test.py -nw 1 -nr 1 -w TestCommonWriteAttrs -r TestCommonReadAttrs")
Expand All @@ -118,39 +118,32 @@ set (ZFPCompression.1x1_CMD "run_test.py -nw 1 -nr 1 --warg=CompressionMethod=zf
set (ZFPCompression.3x5_CMD "run_test.py -nw 3 -nr 5 --warg=CompressionMethod=zfp,WENGINE_PARAMS" )

# Test if writer will survive readers departing unexpectedly
set (KillReadersSerialized_CMD "run_test.py --test_protocol kill_readers -nw 3 -nr 2 --max_readers 1 --warg=RendezvousReaderCount=0,WENGINE_PARAMS --rarg=--ignore_time_gap")
set (KillReadersSerialized_TIMEOUT "300")
set (KillReadersSerialized_PROPERTIES "RUN_SERIAL;1")
set (KillReaders3Max_CMD "run_test.py --test_protocol kill_readers -nw 3 -nr 2 --max_readers 3 --warg=RendezvousReaderCount=0,WENGINE_PARAMS --rarg=--ignore_time_gap")
set (KillReaders3Max_TIMEOUT "300")
set (KillReaders3Max_PROPERTIES "RUN_SERIAL;1")
set (KillReadersSerialized.3x2_CMD "run_test.py --test_protocol kill_readers -nw 3 -nr 2 --max_readers 1 --warg=RendezvousReaderCount=0,WENGINE_PARAMS --rarg=--ignore_time_gap")
set (KillReadersSerialized.3x2_TIMEOUT "300")
set (KillReaders3Max.3x6_CMD "run_test.py --test_protocol kill_readers -nw 3 -nr 2 --max_readers 3 --warg=RendezvousReaderCount=0,WENGINE_PARAMS --rarg=--ignore_time_gap")
set (KillReaders3Max.3x6_TIMEOUT "300")

set (KillWriter_2x2_CMD "run_test.py --test_protocol kill_writer -nw 2 -nr 2 --interval 10 --warg=RendezvousReaderCount=1,WENGINE_PARAMS --rarg=--expect_writer_failure --rarg=--num_steps --rarg=1000")
set (KillWriterTimeout_2x2_CMD "run_test.py --test_protocol kill_writer -nw 2 -nr 2 --interval 10 --warg=RendezvousReaderCount=1,WENGINE_PARAMS --rarg=--expect_writer_failure --rarg=--num_steps --rarg=1000 --rarg=--non_blocking")

set (PreciousTimestep_CMD "run_test.py --test_protocol kill_readers -nw 3 -nr 2 --max_readers 2 --warg=FirstTimestepPrecious=True,RendezvousReaderCount=0,WENGINE_PARAMS --rarg=--ignore_time_gap --rarg=--precious_first")
set (PreciousTimestep.3x2_CMD "run_test.py --test_protocol kill_readers -nw 3 -nr 2 --max_readers 2 --warg=FirstTimestepPrecious=True,RendezvousReaderCount=0,WENGINE_PARAMS --rarg=--ignore_time_gap --rarg=--precious_first")

set (PreciousTimestep_TIMEOUT "300")
set (PreciousTimestep_PROPERTIES "RUN_SERIAL;1")
set (PreciousTimestep.3x2_TIMEOUT "300")

set (PreciousTimestepDiscard_CMD "run_test.py --test_protocol kill_readers -nw 3 -nr 2 --max_readers 2 --warg=FirstTimestepPrecious=On,RendezvousReaderCount=0,QueueLimit=3,QueueFullPolicy=discard,WENGINE_PARAMS --rarg=--ignore_time_gap --rarg=--precious_first --rarg=--discard --warg=--ms_delay --warg=500")
set (PreciousTimestepDiscard_TIMEOUT "300")
set (PreciousTimestepDiscard_PROPERTIES "RUN_SERIAL;1")
set (PreciousTimestepDiscard.3x2_CMD "run_test.py --test_protocol kill_readers -nw 3 -nr 2 --max_readers 2 --warg=FirstTimestepPrecious=On,RendezvousReaderCount=0,QueueLimit=3,QueueFullPolicy=discard,WENGINE_PARAMS --rarg=--ignore_time_gap --rarg=--precious_first --rarg=--discard --warg=--ms_delay --warg=500")
set (PreciousTimestepDiscard.3x2_TIMEOUT "300")

# Readers using BeginStep with timeout. Here we run the writer with a longer delay to make the reader timeout
set (TimeoutReader_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --rarg=--non_blocking --warg=--ms_delay --warg=2000")
set (TimeoutReader_TIMEOUT "60")
set (TimeoutReader_PROPERTIES "RUN_SERIAL;1")
set (TimeoutReader.1x1_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --rarg=--non_blocking --warg=--ms_delay --warg=2000")
set (TimeoutReader.1x1_TIMEOUT "60")

# Readers using LatestAvailable Writer runs faster than reader, so we expect misses
set (LatestReader_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --warg=--ms_delay --warg=250 --rarg=--latest --rarg=--long_first_delay")
set (LatestReader_PROPERTIES "RUN_SERIAL;1")
set (LatestReader.1x1_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --warg=--ms_delay --warg=250 --rarg=--latest --rarg=--long_first_delay")

set (LatestReaderHold_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --warg=--ms_delay --warg=250 --rarg=--latest --rarg=--long_first_delay --rarg=--delay_while_holding")
set (LatestReaderHold_PROPERTIES "RUN_SERIAL;1")
set (LatestReaderHold.1x1_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --warg=--ms_delay --warg=250 --rarg=--latest --rarg=--long_first_delay --rarg=--delay_while_holding")

# A faster writer and a queue policy that will cause timesteps to be discarded
set (DiscardWriter_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --warg=--engine_params --warg=QueueLimit=1,QueueFullPolicy=discard,WENGINE_PARAMS --warg=--ms_delay --warg=250 --rarg=--discard")
set (DiscardWriter.1x1_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --warg=--engine_params --warg=QueueLimit=1,QueueFullPolicy=discard,WENGINE_PARAMS --warg=--ms_delay --warg=250 --rarg=--discard")

function(remove_engine_params_placeholder dst_str src_str )
string(REGEX REPLACE "([^ ]*),WENGINE_PARAMS" "\\1" src_str "${src_str}")
Expand Down

0 comments on commit 04083b7

Please sign in to comment.