Unverified Commit 51641efd authored by pnorbert's avatar pnorbert Committed by GitHub
Browse files

Merge pull request #1069 from pnorbert/mpmdtest

Turn on SST+BP in staging test with timeout in BeginStep
parents d7a9bf23 a8d9a720
Loading
Loading
Loading
Loading
+3 −15
Original line number Diff line number Diff line
@@ -361,23 +361,11 @@ TEST_P(TestStagingMPMD, MultipleSteps)
}

TEST_P(TestStagingMPMD, MultipleStepsWithTimeout)
{
    auto m = engineParams.find("MarshalMethod");
    if (m != engineParams.end() && m->second == "BP")
    {
        if (!wrank)
        {
            std::cout << "Skip MultipleStepsWithTimeout test with BP marshaling"
                      << std::endl;
        }
    }
    else
{
    RunParams p = GetParam();
    // timeout in reader's BeginStep instead of blocking wait
    TestCommon(p, 10, 0, 0, 2.0);
}
}

TEST_P(TestStagingMPMD, SlowWriter)
{