diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-02-04 14:19:29 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-02-04 14:19:31 -0500 |
| commit | 471f5bc433c00fcd0ba778c3f96c91039043cfaa (patch) | |
| tree | 18a72bd6540e8e3ffad9bbd4d62ff1e70d1b6202 | |
| parent | 0ea2d8f8fa1601abb9ce713b7414e7b86f90bc61 (diff) | |
| parent | 53798de93935e463782707bd0b8bdc0d0dd7e185 (diff) | |
| download | googletest-471f5bc433c00fcd0ba778c3f96c91039043cfaa.tar.gz googletest-471f5bc433c00fcd0ba778c3f96c91039043cfaa.tar.bz2 googletest-471f5bc433c00fcd0ba778c3f96c91039043cfaa.zip | |
Merge pull request #2098 from ciband:feat/finish_platformio_support
PiperOrigin-RevId: 232028696
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | googletest/src/gtest-filepath.cc | 5 | ||||
| -rw-r--r-- | library.json | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -56,6 +56,7 @@ Google test has been used on a variety of platforms: * MinGW * Windows Mobile * Symbian + * PlatformIO ## Who Is Using Google Test? ## diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc index 204d4607..499ec587 100644 --- a/googletest/src/gtest-filepath.cc +++ b/googletest/src/gtest-filepath.cc @@ -92,8 +92,9 @@ static bool IsPathSeparator(char c) { // Returns the current working directory, or "" if unsuccessful. FilePath FilePath::GetCurrentDir() { -#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT - // Windows CE doesn't have a current directory, so we just return +#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \ + GTEST_OS_WINDOWS_RT || ARDUINO + // Windows CE and Arduino don't have a current directory, so we just return // something reasonable. return FilePath(kCurrentDirectoryString); #elif GTEST_OS_WINDOWS diff --git a/library.json b/library.json index 84c2b8c8..d8392726 100644 --- a/library.json +++ b/library.json @@ -27,6 +27,7 @@ "googlemock/make", "googlemock/msvc", "googlemock/scripts", + "googlemock/src/gmock_all.cc", "googlemock/src/gmock_main.cc", "googlemock/test", "googlemock/CMakeLists.txt", @@ -38,6 +39,7 @@ "googletest/make", "googletest/msvc", "googletest/scripts", + "googletest/src/gtest_all.cc", "googletest/src/gtest_main.cc", "googletest/test", "googletest/xcode", |