From fe519d64a6e0e69585b59f14c129dc4e2aa40233 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 31 Jan 2019 21:51:55 -0600 Subject: fix: Add *_all.cc files to ignore list Added [gmock|gtest]_all.cc to PIO ignore list to avoid getting duplicate symbols since PIO will compile the individual files. --- library.json | 2 ++ 1 file changed, 2 insertions(+) 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", -- cgit v1.2.3 From b2b24622500dc05cf40a2cb59047d2e8491f4a49 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 31 Jan 2019 21:53:08 -0600 Subject: fix: Add Arduino to embedded platform list Added Arduino to the embedded platform list to allow for a stubbed out version of GetCurrentDir. --- googletest/src/gtest-filepath.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc index 204d4607..4f233e8f 100644 --- a/googletest/src/gtest-filepath.cc +++ b/googletest/src/gtest-filepath.cc @@ -92,8 +92,8 @@ 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 -- cgit v1.2.3 From 53798de93935e463782707bd0b8bdc0d0dd7e185 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 1 Feb 2019 10:05:31 -0600 Subject: chore: Add PlatformIO supported platforms list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cb988ce0..1435929d 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ Google test has been used on a variety of platforms: * MinGW * Windows Mobile * Symbian + * PlatformIO ## Who Is Using Google Test? ## -- cgit v1.2.3