Skip to content

Commit c541e7c

Browse files
Merge pull request #4302 from ciband:feat/nrf52
PiperOrigin-RevId: 549006105 Change-Id: Ifbe2bf57e10df4c71e51dbfaf1687f4f621f5106
2 parents cc36671 + 091d7eb commit c541e7c

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

googlemock/src/gmock_main.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
#include "gmock/gmock.h"
3333
#include "gtest/gtest.h"
3434

35-
#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32)
35+
#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32) || \
36+
(defined(GTEST_OS_NRF52) && defined(ARDUINO))
3637
#ifdef GTEST_OS_ESP8266
3738
extern "C" {
3839
#endif

googletest/include/gtest/internal/gtest-port-arch.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@
115115
#define GTEST_OS_QURT 1
116116
#elif defined(CPU_QN9090) || defined(CPU_QN9090HN)
117117
#define GTEST_OS_NXP_QN9090 1
118+
#elif defined(NRF52)
119+
#define GTEST_OS_NRF52 1
118120
#endif // __CYGWIN__
119121

120122
#endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_

googletest/include/gtest/internal/gtest-port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
506506
defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || \
507507
defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) || \
508508
defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) || \
509-
defined(GTEST_OS_NXP_QN9090)))
509+
defined(GTEST_OS_NXP_QN9090) || defined(GTEST_OS_NRF52)))
510510
#define GTEST_HAS_STD_WSTRING 1
511511
#else
512512
#define GTEST_HAS_STD_WSTRING 0

googletest/src/gtest-filepath.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ FilePath FilePath::GetCurrentDir() {
102102
#if defined(GTEST_OS_WINDOWS_MOBILE) || defined(GTEST_OS_WINDOWS_PHONE) || \
103103
defined(GTEST_OS_WINDOWS_RT) || defined(GTEST_OS_ESP8266) || \
104104
defined(GTEST_OS_ESP32) || defined(GTEST_OS_XTENSA) || \
105-
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090)
105+
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \
106+
defined(GTEST_OS_NRF52)
106107
// These platforms do not have a current directory, so we just return
107108
// something reasonable.
108109
return FilePath(kCurrentDirectoryString);
@@ -356,7 +357,8 @@ bool FilePath::CreateFolder() const {
356357
#elif defined(GTEST_OS_WINDOWS)
357358
int result = _mkdir(pathname_.c_str());
358359
#elif defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \
359-
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090)
360+
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \
361+
defined(GTEST_OS_NRF52)
360362
// do nothing
361363
int result = 0;
362364
#else

googletest/src/gtest_main.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131

3232
#include "gtest/gtest.h"
3333

34-
#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32)
34+
#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32) || \
35+
(defined(GTEST_OS_NRF52) && defined(ARDUINO))
3536
// Arduino-like platforms: program entry points are setup/loop instead of main.
3637

3738
#ifdef GTEST_OS_ESP8266

0 commit comments

Comments
 (0)