update for macos

common/cpp/src/system_io_linux.cpp

@@ -6,6 +6,8 @@
 #include <sys/stat.h>
 #include <algorithm>
 
+#include <errno.h>
+
 using std::string;
 using std::vector;
 using std::chrono::system_clock;
@@ -48,8 +50,15 @@ system_clock::time_point GetTimePointFromFile(const string& fname, IOErrors* err
         return system_clock::time_point{};
     }
 
-    std::chrono::nanoseconds d = std::chrono::nanoseconds{t_stat.st_mtim.tv_nsec} +
+#ifdef __APPLE__
+#define st_mtim st_mtimespec
+#endif
+    std::chrono::nanoseconds d = std::chrono::nanoseconds {t_stat.st_mtim.tv_nsec} +
                                  std::chrono::seconds{t_stat.st_mtim.tv_sec};
+#ifdef __APPLE__
+#undef st_mtim
+#endif
+
     return system_clock::time_point {std::chrono::duration_cast<system_clock::duration>(d)};
 }
 

tests/system_io/cleanup.sh

 #!/usr/bin/env bash
 
 rm -rf test
-rm -rf test_noaccess
+rmdir test_noaccess

worker/api/cpp/unittests/test_folder_broker.cpp

@@ -213,9 +213,9 @@ TEST_F(FolderDataBrokerTests, GetNextCallsOpenFileWithFileName) {
     FileInfo fi;
     FileData data;
 
-    auto err=IOErrors::NO_ERROR;
+    auto err = IOErrors::NO_ERROR;
     EXPECT_CALL(mock, OpenFileToRead("/path/to/file/1", _)).
-        WillOnce(DoAll(testing::SetArgPointee<1>(IOErrors::NO_ERROR),testing::Return(1)));
+    WillOnce(DoAll(testing::SetArgPointee<1>(IOErrors::NO_ERROR), testing::Return(1)));
     data_broker->GetNext(&fi, &data);
     data_broker->io__.release();