diff options
| author | Chris Johnson <chrisjohnsonmail@gmail.com> | 2023-05-11 19:28:16 (GMT) |
|---|---|---|
| committer | Chris Johnson <chrisjohnsonmail@gmail.com> | 2023-06-27 13:29:23 (GMT) |
| commit | 091d7eb897d5671449efb348834e5c78d36f6459 (patch) | |
| tree | 490c528d5e52c5017414b3fe65e86cc318c17406 /googletest/src | |
| parent | 372e81d8141783ff2914349bf6c02819ec08d980 (diff) | |
| download | googletest-091d7eb897d5671449efb348834e5c78d36f6459.zip googletest-091d7eb897d5671449efb348834e5c78d36f6459.tar.gz googletest-091d7eb897d5671449efb348834e5c78d36f6459.tar.bz2 | |
add support for nrf52refs/pull/4302/head
Added support for Nordic nRF52 series of MCUs
Diffstat (limited to 'googletest/src')
| -rw-r--r-- | googletest/src/gtest-filepath.cc | 6 | ||||
| -rw-r--r-- | googletest/src/gtest_main.cc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc index 1d30c95..d43f2e5 100644 --- a/googletest/src/gtest-filepath.cc +++ b/googletest/src/gtest-filepath.cc @@ -102,7 +102,8 @@ FilePath FilePath::GetCurrentDir() { #if defined(GTEST_OS_WINDOWS_MOBILE) || defined(GTEST_OS_WINDOWS_PHONE) || \ defined(GTEST_OS_WINDOWS_RT) || defined(GTEST_OS_ESP8266) || \ defined(GTEST_OS_ESP32) || defined(GTEST_OS_XTENSA) || \ - defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) + defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \ + defined(GTEST_OS_NRF52) // These platforms do not have a current directory, so we just return // something reasonable. return FilePath(kCurrentDirectoryString); @@ -356,7 +357,8 @@ bool FilePath::CreateFolder() const { #elif defined(GTEST_OS_WINDOWS) int result = _mkdir(pathname_.c_str()); #elif defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \ - defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) + defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \ + defined(GTEST_OS_NRF52) // do nothing int result = 0; #else diff --git a/googletest/src/gtest_main.cc b/googletest/src/gtest_main.cc index c2e3b3c..2a9271f 100644 --- a/googletest/src/gtest_main.cc +++ b/googletest/src/gtest_main.cc @@ -31,7 +31,7 @@ #include "gtest/gtest.h" -#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32) +#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32) || (defined(GTEST_OS_NRF52) && defined(ARDUINO)) // Arduino-like platforms: program entry points are setup/loop instead of main. #ifdef GTEST_OS_ESP8266 |