aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/src
diff options
context:
space:
mode:
authorChris Johnson <chrisjohnsonmail@gmail.com>2019-08-28 09:39:35 -0500
committerChris Johnson <chrisjohnsonmail@gmail.com>2019-10-11 11:47:49 -0500
commit40a6b9662199890b20ccbac3b964ce04713d8ede (patch)
treed2123c108b6a6bbcf7d5f07dc792daab57c993fb /googletest/src
parentba513d2c9525a7c986c115ed5d603f2cf17c6016 (diff)
downloadgoogletest-40a6b9662199890b20ccbac3b964ce04713d8ede.tar.gz
googletest-40a6b9662199890b20ccbac3b964ce04713d8ede.tar.bz2
googletest-40a6b9662199890b20ccbac3b964ce04713d8ede.zip
feat: Add support for ESP8266 platform
Added support for ESP8266 Arduino platform. Refactored Arduino defines to use the GTEST_OS_* model.
Diffstat (limited to 'googletest/src')
-rw-r--r--googletest/src/gtest-filepath.cc2
-rw-r--r--googletest/src/gtest.cc2
-rw-r--r--googletest/src/gtest_main.cc2
3 files changed, 4 insertions, 2 deletions
diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc
index bd7b99ff..eb1024e4 100644
--- a/googletest/src/gtest-filepath.cc
+++ b/googletest/src/gtest-filepath.cc
@@ -93,7 +93,7 @@ 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 || ARDUINO || defined(ESP_PLATFORM)
+ GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_ESP32
// These platforms do not have a current directory, so we just return
// something reasonable.
return FilePath(kCurrentDirectoryString);
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index a5b4e5ac..a11ce184 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -4508,6 +4508,7 @@ class ScopedPrematureExitFile {
}
~ScopedPrematureExitFile() {
+ #if !defined GTEST_OS_ESP8266
if (!premature_exit_filepath_.empty()) {
int retval = remove(premature_exit_filepath_.c_str());
if (retval) {
@@ -4516,6 +4517,7 @@ class ScopedPrematureExitFile {
<< retval;
}
}
+ #endif
}
private:
diff --git a/googletest/src/gtest_main.cc b/googletest/src/gtest_main.cc
index f6e1dd96..361cb739 100644
--- a/googletest/src/gtest_main.cc
+++ b/googletest/src/gtest_main.cc
@@ -30,7 +30,7 @@
#include <cstdio>
#include "gtest/gtest.h"
-#ifdef ARDUINO
+#if defined GTEST_OS_ESP8266 || defined GTEST_OS_ESP32
void setup() {
testing::InitGoogleTest();
}