Merge branch 'master' into reset-molecules

2020-07-12 20:36:34 -04:00
parent 0c89b517a5 284b1618f9
commit 1c5c2d8f22
57 changed files with 413 additions and 131 deletions
--- a/unittest/commands/test_simple_commands.cpp
+++ b/unittest/commands/test_simple_commands.cpp
@ -168,8 +168,10 @@ TEST_F(SimpleCommandsTest, Quit)
    auto mesg = ::testing::internal::GetCapturedStdout();
    ASSERT_THAT(mesg, MatchesRegex(".*ERROR: Expected integer .*"));

+#if !defined(OMPI_MAJOR_VERSION) // this stalls with OpenMPI. skip.
    ASSERT_EXIT(lmp->input->one("quit"), ExitedWithCode(0), "");
    ASSERT_EXIT(lmp->input->one("quit 9"), ExitedWithCode(9), "");
+#endif
 }

 TEST_F(SimpleCommandsTest, ResetTimestep)