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

Merge branch 'develop' into multi-config-support

Browse Source 
# Conflicts:
#	unittest/force-styles/test_error_stats.cpp
This commit is contained in:
Axel Kohlmeyer
2021-11-04 15:50:49 -04:00
parent 7c80911f66 3ec3085f39
commit aab4f71019
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unittest/commands/test_variables.cpp
View File

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

1
unittest/force-styles/test_error_stats.cpp
View File

@ -9,6 +9,7 @@
#include "fmtlib_format.cpp" #include "fmtlib_format.cpp"
#include "fmtlib_os.cpp" #include "fmtlib_os.cpp"
// Windows may define this as a macro
#if defined(max) #if defined(max)
#undef max #undef max
#endif #endif

12
unittest/formats/test_text_file_reader.cpp
View File

@ -35,8 +35,8 @@ class TextFileReaderTest : public ::testing::Test {
protected: protected:
void TearDown() override void TearDown() override
{ {
unlink("text_reader_one.file"); platform::unlink("text_reader_one.file");
unlink("text_reader_two.file"); platform::unlink("text_reader_two.file");
} }
void test_files() void test_files()
@ -65,16 +65,22 @@ TEST_F(TextFileReaderTest, nofile)
FileReaderException); FileReaderException);
} }
// this test cannot work on windows due to its non unix-like permission system
#if !defined(_WIN32)
TEST_F(TextFileReaderTest, permissions) TEST_F(TextFileReaderTest, permissions)
{ {
platform::unlink("text_reader_noperms.file");
FILE *fp = fopen("text_reader_noperms.file", "w"); FILE *fp = fopen("text_reader_noperms.file", "w");
ASSERT_NE(fp,nullptr);
fputs("word\n", fp); fputs("word\n", fp);
fclose(fp); fclose(fp);
chmod("text_reader_noperms.file", 0); chmod("text_reader_noperms.file", 0);
ASSERT_THROW({ TextFileReader reader("text_reader_noperms.file", "test"); }, ASSERT_THROW({ TextFileReader reader("text_reader_noperms.file", "test"); },
FileReaderException); FileReaderException);
unlink("text_reader_noperms.file"); platform::unlink("text_reader_noperms.file");
} }
#endif
TEST_F(TextFileReaderTest, nofp) TEST_F(TextFileReaderTest, nofp)
{ {