ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consistently skip death tests at runtime when using OpenMPI without exceptions

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-07-18 13:09:17 -04:00
parent 5c191e1e6e
commit 859da19869
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
unittest/commands/test_kim_commands.cpp
View File

@ -26,6 +26,12 @@
// whether to print verbose output (i.e. not capturing LAMMPS screen output). // whether to print verbose output (i.e. not capturing LAMMPS screen output).
bool verbose = false; bool verbose = false;
#if defined(OMPI_MAJOR_VERSION)
const bool have_openmpi = true;
#else
const bool have_openmpi = false;
#endif
using LAMMPS_NS::utils::split_words; using LAMMPS_NS::utils::split_words;
namespace LAMMPS_NS { namespace LAMMPS_NS {
@ -33,11 +39,19 @@ using ::testing::ExitedWithCode;
using ::testing::MatchesRegex; using ::testing::MatchesRegex;
using ::testing::StrEq; using ::testing::StrEq;
#define TEST_FAILURE(...) \ #define TEST_FAILURE(errmsg, ...) \
if (Info::has_exceptions()) { \ if (Info::has_exceptions()) { \
ASSERT_ANY_THROW({__VA_ARGS__}); \ ::testing::internal::CaptureStdout(); \
} else { \ ASSERT_ANY_THROW({__VA_ARGS__}); \
ASSERT_DEATH({__VA_ARGS__}, ""); \ auto mesg = ::testing::internal::GetCapturedStdout(); \
ASSERT_THAT(mesg, MatchesRegex(errmsg)); \
} else { \
if (!have_openmpi) { \
::testing::internal::CaptureStdout(); \
ASSERT_DEATH({__VA_ARGS__}, ""); \
auto mesg = ::testing::internal::GetCapturedStdout(); \
ASSERT_THAT(mesg, MatchesRegex(errmsg)); \
} \
} }
class KimCommandsTest : public ::testing::Test { class KimCommandsTest : public ::testing::Test {
@ -73,15 +87,9 @@ TEST_F(KimCommandsTest, kim_init)
int ifix = lmp->modify->find_fix("KIM_MODEL_STORE"); int ifix = lmp->modify->find_fix("KIM_MODEL_STORE");
ASSERT_GE(ifix, 0); ASSERT_GE(ifix, 0);
::testing::internal::CaptureStdout(); TEST_FAILURE(".*ERROR: Illegal kim_init command.*", lmp->input->one("kim_init"););
TEST_FAILURE(lmp->input->one("kim_init");); TEST_FAILURE(".*ERROR: KIM Model name not found.*",
auto mesg = ::testing::internal::GetCapturedStdout(); lmp->input->one("kim_init Unknown_Model real"););
ASSERT_THAT(mesg, MatchesRegex(".*ERROR: Illegal kim_init command.*"));
::testing::internal::CaptureStdout();
TEST_FAILURE(lmp->input->one("kim_init Unknown_Model real"););
mesg = ::testing::internal::GetCapturedStdout();
ASSERT_THAT(mesg, MatchesRegex(".*ERROR: KIM Model name not found.*"));
} }
TEST_F(KimCommandsTest, kim_interactions_ar) TEST_F(KimCommandsTest, kim_interactions_ar)
@ -109,6 +117,10 @@ int main(int argc, char **argv)
MPI_Init(&argc, &argv); MPI_Init(&argc, &argv);
::testing::InitGoogleMock(&argc, argv); ::testing::InitGoogleMock(&argc, argv);
if (have_openmpi && !LAMMPS_NS::Info::has_exceptions())
std::cout << "Warning: using OpenMPI without exceptions. "
"Death tests will be skipped\n";
// handle arguments passed via environment variable // handle arguments passed via environment variable
if (const char *var = getenv("TEST_ARGS")) { if (const char *var = getenv("TEST_ARGS")) {
std::vector<std::string> env = split_words(var); std::vector<std::string> env = split_words(var);