Merge branch 'develop' into multi-config-support

# Conflicts:
#	unittest/force-styles/test_error_stats.cpp
This commit is contained in:
Axel Kohlmeyer
2021-11-04 15:50:49 -04:00
3 changed files with 13 additions and 6 deletions

View File

@ -59,8 +59,8 @@ protected:
void TearDown() override
{
LAMMPSTest::TearDown();
unlink("test_variable.file");
unlink("test_variable.atomfile");
platform::unlink("test_variable.file");
platform::unlink("test_variable.atomfile");
}
void atomic_system()
@ -165,7 +165,7 @@ TEST_F(VariableTest, CreateDelete)
fputs(" ", fp);
fclose(fp);
ASSERT_THAT(variable->retrieve("file"), StrEq("1"));
unlink("MYFILE");
platform::unlink("MYFILE");
ASSERT_THAT(variable->retrieve("file"), StrEq("0"));
BEGIN_HIDE_OUTPUT();