Merge pull request #2098 from ciband:feat/finish_platformio_support

PiperOrigin-RevId: 232028696
This commit is contained in:
Gennadiy Civil 2019-02-04 14:19:29 -05:00
commit 471f5bc433
3 changed files with 6 additions and 2 deletions

View File

@ -56,6 +56,7 @@ Google test has been used on a variety of platforms:
* MinGW * MinGW
* Windows Mobile * Windows Mobile
* Symbian * Symbian
* PlatformIO
## Who Is Using Google Test? ## ## Who Is Using Google Test? ##

View File

@ -92,8 +92,9 @@ static bool IsPathSeparator(char c) {
// Returns the current working directory, or "" if unsuccessful. // Returns the current working directory, or "" if unsuccessful.
FilePath FilePath::GetCurrentDir() { FilePath FilePath::GetCurrentDir() {
#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT #if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
// Windows CE doesn't have a current directory, so we just return GTEST_OS_WINDOWS_RT || ARDUINO
// Windows CE and Arduino don't have a current directory, so we just return
// something reasonable. // something reasonable.
return FilePath(kCurrentDirectoryString); return FilePath(kCurrentDirectoryString);
#elif GTEST_OS_WINDOWS #elif GTEST_OS_WINDOWS

View File

@ -27,6 +27,7 @@
"googlemock/make", "googlemock/make",
"googlemock/msvc", "googlemock/msvc",
"googlemock/scripts", "googlemock/scripts",
"googlemock/src/gmock_all.cc",
"googlemock/src/gmock_main.cc", "googlemock/src/gmock_main.cc",
"googlemock/test", "googlemock/test",
"googlemock/CMakeLists.txt", "googlemock/CMakeLists.txt",
@ -38,6 +39,7 @@
"googletest/make", "googletest/make",
"googletest/msvc", "googletest/msvc",
"googletest/scripts", "googletest/scripts",
"googletest/src/gtest_all.cc",
"googletest/src/gtest_main.cc", "googletest/src/gtest_main.cc",
"googletest/test", "googletest/test",
"googletest/xcode", "googletest/xcode",