From 84a5ae8b85605fd51cf3d0107315670d3cf00fa4 Mon Sep 17 00:00:00 2001
From: Chris Johnson <chrisjohnsonmail@gmail.com>
Date: Mon, 7 Oct 2019 09:23:59 -0500
Subject: Update to distinguish prelease purpose of this fork.

---
 googletest/include/gtest/internal/gtest-port.h | 10 ++++----
 library.json                                   | 32 +++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index f24afe7..761b493 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -449,7 +449,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // no support for it at least as recent as Froyo (2.2).
 #define GTEST_HAS_STD_WSTRING                                         \
   (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
-     GTEST_OS_HAIKU))
+     GTEST_OS_HAIKU || GTEST_OS_ESP8266))
 
 #endif  // GTEST_HAS_STD_WSTRING
 
@@ -573,7 +573,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 #ifndef GTEST_HAS_STREAM_REDIRECTION
 // By default, we assume that stream redirection is supported on all
 // platforms except known mobile ones.
-# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
+# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266
 #  define GTEST_HAS_STREAM_REDIRECTION 0
 # else
 #  define GTEST_HAS_STREAM_REDIRECTION 1
@@ -1989,9 +1989,9 @@ typedef struct stat StatStruct;
 
 inline int FileNo(FILE* file) { return fileno(file); }
 inline int IsATTY(int fd) { return isatty(fd); }
-inline int Stat(const char* path, StatStruct* buf) { 
+inline int Stat(const char* path, StatStruct* buf) {
   // stat function not implemented on ESP8266
-  return 0; 
+  return 0;
   }
 inline int StrCaseCmp(const char* s1, const char* s2) {
   return strcasecmp(s1, s2);
@@ -2052,7 +2052,7 @@ inline int Close(int fd) { return close(fd); }
 inline const char* StrError(int errnum) { return strerror(errnum); }
 #endif
 inline const char* GetEnv(const char* name) {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266
   // We are on Windows CE, which has no environment variables.
   static_cast<void>(name);  // To prevent 'unused argument' warning.
   return nullptr;
diff --git a/library.json b/library.json
index e46fcbd..e8f0d6c 100644
--- a/library.json
+++ b/library.json
@@ -1,17 +1,18 @@
 {
-  "name": "googletest",
+  "name": "googletest-ciband-prelease",
   "keywords": "unittest, unit, test, gtest, gmock",
-  "description": "googletest is a testing framework developed by the Testing Technology team with Google's specific requirements and constraints in mind. No matter whether you work on Linux, Windows, or a Mac, if you write C++ code, googletest can help you. And it supports any kind of tests, not just unit tests.",
+  "description": "***This is a prelease repo to use new features before they are added to googletest.*** googletest is a testing framework developed by the Testing Technology team with Google's specific requirements and constraints in mind. No matter whether you work on Linux, Windows, or a Mac, if you write C++ code, googletest can help you. And it supports any kind of tests, not just unit tests.",
    "license": "BSD-3-Clause",
   "homepage": "https://github.com/google/googletest/blob/master/README.md",
   "repository": {
     "type": "git",
-    "url": "https://github.com/google/googletest.git"
+    "url": "https://github.com/ciband/googletest.git"
   },
   "version": "1.8.1",
   "frameworks": "arduino",
   "platforms": [
-        "espressif32"
+        "espressif32",
+        "espressif8266"
   ],
   "export": {
         "include": [
@@ -29,7 +30,7 @@
             "googlemock/scripts",
             "googlemock/src/gmock-all.cc",
             "googlemock/src/gmock_main.cc",
-            "googlemock/test",
+            "googlemock/test/*",
             "googlemock/CMakeLists.txt",
             "googlemock/Makefile.am",
             "googlemock/configure.ac",
@@ -38,10 +39,11 @@
             "googletest/m4",
             "googletest/make",
             "googletest/msvc",
+            "googletest/samples",
             "googletest/scripts",
             "googletest/src/gtest-all.cc",
             "googletest/src/gtest_main.cc",
-            "googletest/test",
+            "googletest/test/*",
             "googletest/xcode",
             "googletest/CMakeLists.txt",
             "googletest/Makefile.am",
@@ -54,6 +56,24 @@
             "-Igooglemock",
             "-Igoogletest/include",
             "-Igoogletest"
+        ],
+        "srcFilter": [
+          "+<*>",
+          "-<.git/>",
+          "-<googlemock>",
+          "-<googlemock/test/>",
+          "-<googlemock/src>",
+          "+<googlemock/src/gmock-all.cc>",
+          "+<googletest/src/gtest-all.cc>",
+          "+<googlemock/src/gmock_main.cc>",
+          "-<googletest>",
+          "-<googletest/codegear/>",
+          "-<googletest/samples>",
+          "-<googletest/test/>",
+          "-<googletest/xcode>",
+          "-<googletest/src>",
+          "+<googletest/src/gtest-all.cc>",
+          "+<googletest/src/gtest_main.cc>"
         ]
   }
 }
-- 
cgit v0.12