gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to distinguish prelease purpose of this fork.

Browse Source
This commit is contained in:
Chris Johnson 2019-10-07 09:23:59 -05:00
parent c2206b05aa
commit 84a5ae8b85
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
googletest/include/gtest/internal/gtest-port.h
View File

@ -449,7 +449,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
// no support for it at least as recent as Froyo (2.2). // no support for it at least as recent as Froyo (2.2).
#define GTEST_HAS_STD_WSTRING \ #define GTEST_HAS_STD_WSTRING \
(!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
GTEST_OS_HAIKU)) GTEST_OS_HAIKU || GTEST_OS_ESP8266))
#endif // GTEST_HAS_STD_WSTRING #endif // GTEST_HAS_STD_WSTRING
@ -573,7 +573,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
#ifndef GTEST_HAS_STREAM_REDIRECTION #ifndef GTEST_HAS_STREAM_REDIRECTION
// By default, we assume that stream redirection is supported on all // By default, we assume that stream redirection is supported on all
// platforms except known mobile ones. // 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 # define GTEST_HAS_STREAM_REDIRECTION 0
# else # else
# define GTEST_HAS_STREAM_REDIRECTION 1 # define GTEST_HAS_STREAM_REDIRECTION 1
@ -2052,7 +2052,7 @@ inline int Close(int fd) { return close(fd); }
inline const char* StrError(int errnum) { return strerror(errnum); } inline const char* StrError(int errnum) { return strerror(errnum); }
#endif #endif
inline const char* GetEnv(const char* name) { 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. // We are on Windows CE, which has no environment variables.
static_cast<void>(name); // To prevent 'unused argument' warning. static_cast<void>(name); // To prevent 'unused argument' warning.
return nullptr; return nullptr;

32
library.json
View File

@ -1,17 +1,18 @@
{ {
"name": "googletest", "name": "googletest-ciband-prelease",
"keywords": "unittest, unit, test, gtest, gmock", "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", "license": "BSD-3-Clause",
"homepage": "https://github.com/google/googletest/blob/master/README.md", "homepage": "https://github.com/google/googletest/blob/master/README.md",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/google/googletest.git" "url": "https://github.com/ciband/googletest.git"
}, },
"version": "1.8.1", "version": "1.8.1",
"frameworks": "arduino", "frameworks": "arduino",
"platforms": [ "platforms": [
"espressif32" "espressif32",
"espressif8266"
], ],
"export": { "export": {
"include": [ "include": [
@ -29,7 +30,7 @@
"googlemock/scripts", "googlemock/scripts",
"googlemock/src/gmock-all.cc", "googlemock/src/gmock-all.cc",
"googlemock/src/gmock_main.cc", "googlemock/src/gmock_main.cc",
"googlemock/test", "googlemock/test/*",
"googlemock/CMakeLists.txt", "googlemock/CMakeLists.txt",
"googlemock/Makefile.am", "googlemock/Makefile.am",
"googlemock/configure.ac", "googlemock/configure.ac",
@ -38,10 +39,11 @@
"googletest/m4", "googletest/m4",
"googletest/make", "googletest/make",
"googletest/msvc", "googletest/msvc",
"googletest/samples",
"googletest/scripts", "googletest/scripts",
"googletest/src/gtest-all.cc", "googletest/src/gtest-all.cc",
"googletest/src/gtest_main.cc", "googletest/src/gtest_main.cc",
"googletest/test", "googletest/test/*",
"googletest/xcode", "googletest/xcode",
"googletest/CMakeLists.txt", "googletest/CMakeLists.txt",
"googletest/Makefile.am", "googletest/Makefile.am",
@ -54,6 +56,24 @@
"-Igooglemock", "-Igooglemock",
"-Igoogletest/include", "-Igoogletest/include",
"-Igoogletest" "-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>"
] ]
} }
} }