diff options
author | Copybara-Service <copybara-worker@google.com> | 2023-06-26 20:23:58 (GMT) |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2023-06-26 20:23:58 (GMT) |
commit | 372e81d8141783ff2914349bf6c02819ec08d980 (patch) | |
tree | c7a7268259498bd3a4c7137c0889178af3c7c2b4 | |
parent | ec4fed93217bc2830959bb8e86798c1d86956949 (diff) | |
parent | b2a2d36f3a28921af8ccbed92c47fbfe8570173c (diff) | |
download | googletest-372e81d8141783ff2914349bf6c02819ec08d980.zip googletest-372e81d8141783ff2914349bf6c02819ec08d980.tar.gz googletest-372e81d8141783ff2914349bf6c02819ec08d980.tar.bz2 |
Merge pull request #4301 from ciband:feat/qn9090
PiperOrigin-RevId: 543523833
Change-Id: I602373a321e2b8080264e3f418ef5b2254f615fb
-rw-r--r-- | googletest/include/gtest/internal/gtest-port-arch.h | 2 | ||||
-rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 3 | ||||
-rw-r--r-- | googletest/src/gtest-filepath.cc | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h index 0406460..3496493 100644 --- a/googletest/include/gtest/internal/gtest-port-arch.h +++ b/googletest/include/gtest/internal/gtest-port-arch.h @@ -113,6 +113,8 @@ #define GTEST_OS_XTENSA 1 #elif defined(__hexagon__) #define GTEST_OS_QURT 1 +#elif defined(CPU_QN9090) || defined(CPU_QN9090HN) +#define GTEST_OS_NXP_QN9090 1 #endif // __CYGWIN__ #endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index d71110c..8b66714 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -505,7 +505,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; #if (!(defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_CYGWIN) || \ defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || \ defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) || \ - defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT))) + defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) || \ + defined(GTEST_OS_NXP_QN9090))) #define GTEST_HAS_STD_WSTRING 1 #else #define GTEST_HAS_STD_WSTRING 0 diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc index 75f52bc..1d30c95 100644 --- a/googletest/src/gtest-filepath.cc +++ b/googletest/src/gtest-filepath.cc @@ -102,7 +102,7 @@ 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_QURT) || defined(GTEST_OS_NXP_QN9090) // These platforms do not have a current directory, so we just return // something reasonable. return FilePath(kCurrentDirectoryString); @@ -356,7 +356,7 @@ 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_QURT) || defined(GTEST_OS_NXP_QN9090) // do nothing int result = 0; #else |