Unverified Commit bd587221 authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon Committed by GitHub
Browse files

Merge pull request #1588 from chuckatkins/fix-staging-shared-tests

Fix staging shared tests
parents 7971bc58 19d49cf2
......@@ -199,7 +199,7 @@ endif()
#
# Setup tests for BP engine
#
if (NOT MSVC) # not on windows
if(NOT MSVC) # not on windows
# Local Vars don't work for InSitu
set (BP_TESTS ${ALL_SIMPLE_TESTS})
# Delayed reader not worth testing on file engines
......@@ -210,12 +210,12 @@ if (NOT MSVC) # not on windows
add_common_test(${test} BP3)
add_common_test(${test} BP4)
endforeach()
endif(NOT MSVC)
endif()
#
# Setup tests for HDF5 engine
#
if (NOT MSVC AND ADIOS2_HAVE_HDF5) # not on windows and only if we have HDF5
if(NOT MSVC AND ADIOS2_HAVE_HDF5) # not on windows and only if we have HDF5
set (HDF5_TESTS ${ALL_SIMPLE_TESTS})
# Delayed reader not worth testing on file engines
list (FILTER HDF5_TESTS EXCLUDE REGEX "DelayedReader")
......@@ -226,14 +226,14 @@ if (NOT MSVC AND ADIOS2_HAVE_HDF5) # not on windows and only if we have HDF5
foreach(test ${HDF5_TESTS})
add_common_test(${test} HDF5)
endforeach()
endif(NOT MSVC)
endif()
#
# Setup tests for SSC engine
#
if(ADIOS2_HAVE_SSC AND ADIOS2_HAVE_MPI)
SET (SSC_TESTS "NoReaderNoWait")
set(SSC_TESTS "NoReaderNoWait")
foreach(test ${SSC_TESTS})
add_common_test(${test} SSC)
endforeach()
......
......@@ -74,11 +74,11 @@ TEST_F(CommonReadTest, ADIOS2CommonRead1D8)
{
varname2 = "r64";
}
while (engine1.BeginStep() == adios2::StepStatus::OK)
while (engine1.BeginStep() == adios2::StepStatus::OK &&
engine2.BeginStep() == adios2::StepStatus::OK)
{
size_t writerSize;
assert(engine2.BeginStep() == adios2::StepStatus::OK);
auto var1 = io1.InquireVariable<double>(varname1);
auto var2 = io2.InquireVariable<double>(varname2);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment