diff options
| author | vslashg <gfalcon@google.com> | 2019-10-25 10:21:03 -0400 |
|---|---|---|
| committer | vslashg <gfalcon@google.com> | 2019-10-25 10:21:03 -0400 |
| commit | 540835fa687e73c9d634c710e62a721c2be40786 (patch) | |
| tree | 7103d19b9edeff546e862b88b6e90226382f81de /googlemock/src | |
| parent | 37f322783175a66c11785d17fc153477b0777753 (diff) | |
| parent | 778733f9ecdd2b14a0167df54dd25d2d6f6e24f6 (diff) | |
| download | googletest-540835fa687e73c9d634c710e62a721c2be40786.tar.gz googletest-540835fa687e73c9d634c710e62a721c2be40786.tar.bz2 googletest-540835fa687e73c9d634c710e62a721c2be40786.zip | |
Merge pull request #2515 from ciband:feat/support_esp8266
PiperOrigin-RevId: 276333426
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock_main.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/googlemock/src/gmock_main.cc b/googlemock/src/gmock_main.cc index 98611b93..18c500f6 100644 --- a/googlemock/src/gmock_main.cc +++ b/googlemock/src/gmock_main.cc @@ -32,7 +32,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#ifdef ARDUINO +#if GTEST_OS_ESP8266 || GTEST_OS_ESP32 +#if GTEST_OS_ESP8266 +extern "C" { +#endif void setup() { // Since Google Mock depends on Google Test, InitGoogleMock() is // also responsible for initializing Google Test. Therefore there's @@ -40,6 +43,10 @@ void setup() { testing::InitGoogleMock(); } void loop() { RUN_ALL_TESTS(); } +#if GTEST_OS_ESP8266 +} +#endif + #else // MS C++ compiler/linker has a bug on Windows (not on Windows CE), which |