mirror of
https://github.com/google/googletest.git
synced 2024-12-28 02:53:16 +08:00
Introduces a new porting flag (GTEST_HAS_FILE_SYSTEM) to indicate whether a platform supports filesystem operations.
PiperOrigin-RevId: 494751986 Change-Id: I07f73bdf478a73934b8f1a69c1ab4abda1b231ae
This commit is contained in:
parent
516940f16d
commit
b0846aaf37
@ -42,11 +42,14 @@
|
|||||||
#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
|
#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
|
||||||
#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
|
#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
|
||||||
|
|
||||||
|
#include "gtest/internal/gtest-port.h"
|
||||||
#include "gtest/internal/gtest-string.h"
|
#include "gtest/internal/gtest-string.h"
|
||||||
|
|
||||||
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
|
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
|
||||||
/* class A needs to have dll-interface to be used by clients of class B */)
|
/* class A needs to have dll-interface to be used by clients of class B */)
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
namespace testing {
|
namespace testing {
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|
||||||
@ -217,4 +220,6 @@ class GTEST_API_ FilePath {
|
|||||||
|
|
||||||
GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
|
GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
|
||||||
|
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
#endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
|
#endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
|
||||||
|
@ -83,6 +83,8 @@
|
|||||||
// GTEST_HAS_STD_WSTRING - Define it to 1/0 to indicate that
|
// GTEST_HAS_STD_WSTRING - Define it to 1/0 to indicate that
|
||||||
// std::wstring does/doesn't work (Google Test can
|
// std::wstring does/doesn't work (Google Test can
|
||||||
// be used where std::wstring is unavailable).
|
// be used where std::wstring is unavailable).
|
||||||
|
// GTEST_HAS_FILE_SYSTEM - Define it to 1/0 to indicate whether or not a
|
||||||
|
// file system is/isn't available.
|
||||||
// GTEST_HAS_SEH - Define it to 1/0 to indicate whether the
|
// GTEST_HAS_SEH - Define it to 1/0 to indicate whether the
|
||||||
// compiler supports Microsoft's "Structured
|
// compiler supports Microsoft's "Structured
|
||||||
// Exception Handling".
|
// Exception Handling".
|
||||||
@ -463,6 +465,11 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
|
|||||||
|
|
||||||
#endif // GTEST_HAS_STD_WSTRING
|
#endif // GTEST_HAS_STD_WSTRING
|
||||||
|
|
||||||
|
#ifndef GTEST_HAS_FILE_SYSTEM
|
||||||
|
// Most platforms support a file system.
|
||||||
|
#define GTEST_HAS_FILE_SYSTEM 1
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
// Determines whether RTTI is available.
|
// Determines whether RTTI is available.
|
||||||
#ifndef GTEST_HAS_RTTI
|
#ifndef GTEST_HAS_RTTI
|
||||||
// The user didn't tell us whether RTTI is enabled, so we need to
|
// The user didn't tell us whether RTTI is enabled, so we need to
|
||||||
@ -580,10 +587,11 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
|
|||||||
// output correctness and to implement death tests.
|
// output correctness and to implement death tests.
|
||||||
#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 / embedded ones.
|
// platforms except known mobile / embedded ones. Also, if the port doesn't have
|
||||||
|
// a file system, stream redirection is not supported.
|
||||||
#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
|
#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
|
||||||
GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA || \
|
GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA || \
|
||||||
GTEST_OS_QURT
|
GTEST_OS_QURT || !GTEST_HAS_FILE_SYSTEM
|
||||||
#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
|
||||||
@ -599,7 +607,10 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
|
|||||||
GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || \
|
GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || \
|
||||||
GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU || \
|
GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU || \
|
||||||
GTEST_OS_GNU_HURD)
|
GTEST_OS_GNU_HURD)
|
||||||
|
// Death tests require a file system to work properly.
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
#define GTEST_HAS_DEATH_TEST 1
|
#define GTEST_HAS_DEATH_TEST 1
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Determines whether to support type-driven tests.
|
// Determines whether to support type-driven tests.
|
||||||
@ -1953,12 +1964,55 @@ inline std::string StripTrailingSpaces(std::string str) {
|
|||||||
|
|
||||||
namespace posix {
|
namespace posix {
|
||||||
|
|
||||||
// Functions with a different name on Windows.
|
// File system porting.
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
#if GTEST_OS_WINDOWS
|
#if GTEST_OS_WINDOWS
|
||||||
|
|
||||||
typedef struct _stat StatStruct;
|
typedef struct _stat StatStruct;
|
||||||
|
|
||||||
|
#if GTEST_OS_WINDOWS_MOBILE
|
||||||
|
inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
|
||||||
|
// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
|
||||||
|
// time and thus not defined there.
|
||||||
|
#else
|
||||||
|
inline int FileNo(FILE* file) { return _fileno(file); }
|
||||||
|
inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
|
||||||
|
inline int RmDir(const char* dir) { return _rmdir(dir); }
|
||||||
|
inline bool IsDir(const StatStruct& st) { return (_S_IFDIR & st.st_mode) != 0; }
|
||||||
|
#endif // GTEST_OS_WINDOWS_MOBILE
|
||||||
|
|
||||||
|
#elif GTEST_OS_ESP8266
|
||||||
|
typedef struct stat StatStruct;
|
||||||
|
|
||||||
|
inline int FileNo(FILE* file) { return fileno(file); }
|
||||||
|
inline int Stat(const char* path, StatStruct* buf) {
|
||||||
|
// stat function not implemented on ESP8266
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
inline int RmDir(const char* dir) { return rmdir(dir); }
|
||||||
|
inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
typedef struct stat StatStruct;
|
||||||
|
|
||||||
|
inline int FileNo(FILE* file) { return fileno(file); }
|
||||||
|
inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
|
||||||
|
#if GTEST_OS_QURT
|
||||||
|
// QuRT doesn't support any directory functions, including rmdir
|
||||||
|
inline int RmDir(const char*) { return 0; }
|
||||||
|
#else
|
||||||
|
inline int RmDir(const char* dir) { return rmdir(dir); }
|
||||||
|
#endif
|
||||||
|
inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
|
||||||
|
|
||||||
|
#endif // GTEST_OS_WINDOWS
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
|
// Other functions with a different name on Windows.
|
||||||
|
|
||||||
|
#if GTEST_OS_WINDOWS
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
inline int DoIsATTY(int fd) { return isatty(fd); }
|
inline int DoIsATTY(int fd) { return isatty(fd); }
|
||||||
inline int StrCaseCmp(const char* s1, const char* s2) {
|
inline int StrCaseCmp(const char* s1, const char* s2) {
|
||||||
@ -1978,51 +2032,21 @@ inline int StrCaseCmp(const char* s1, const char* s2) {
|
|||||||
inline char* StrDup(const char* src) { return _strdup(src); }
|
inline char* StrDup(const char* src) { return _strdup(src); }
|
||||||
#endif // __BORLANDC__
|
#endif // __BORLANDC__
|
||||||
|
|
||||||
#if GTEST_OS_WINDOWS_MOBILE
|
|
||||||
inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
|
|
||||||
// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
|
|
||||||
// time and thus not defined there.
|
|
||||||
#else
|
|
||||||
inline int FileNo(FILE* file) { return _fileno(file); }
|
|
||||||
inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
|
|
||||||
inline int RmDir(const char* dir) { return _rmdir(dir); }
|
|
||||||
inline bool IsDir(const StatStruct& st) { return (_S_IFDIR & st.st_mode) != 0; }
|
|
||||||
#endif // GTEST_OS_WINDOWS_MOBILE
|
|
||||||
|
|
||||||
#elif GTEST_OS_ESP8266
|
#elif GTEST_OS_ESP8266
|
||||||
typedef struct stat StatStruct;
|
|
||||||
|
|
||||||
inline int FileNo(FILE* file) { return fileno(file); }
|
|
||||||
inline int DoIsATTY(int fd) { return isatty(fd); }
|
inline int DoIsATTY(int fd) { return isatty(fd); }
|
||||||
inline int Stat(const char* path, StatStruct* buf) {
|
|
||||||
// stat function not implemented on ESP8266
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
inline int StrCaseCmp(const char* s1, const char* s2) {
|
inline int StrCaseCmp(const char* s1, const char* s2) {
|
||||||
return strcasecmp(s1, s2);
|
return strcasecmp(s1, s2);
|
||||||
}
|
}
|
||||||
inline char* StrDup(const char* src) { return strdup(src); }
|
inline char* StrDup(const char* src) { return strdup(src); }
|
||||||
inline int RmDir(const char* dir) { return rmdir(dir); }
|
|
||||||
inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
typedef struct stat StatStruct;
|
|
||||||
|
|
||||||
inline int FileNo(FILE* file) { return fileno(file); }
|
|
||||||
inline int DoIsATTY(int fd) { return isatty(fd); }
|
inline int DoIsATTY(int fd) { return isatty(fd); }
|
||||||
inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
|
|
||||||
inline int StrCaseCmp(const char* s1, const char* s2) {
|
inline int StrCaseCmp(const char* s1, const char* s2) {
|
||||||
return strcasecmp(s1, s2);
|
return strcasecmp(s1, s2);
|
||||||
}
|
}
|
||||||
inline char* StrDup(const char* src) { return strdup(src); }
|
inline char* StrDup(const char* src) { return strdup(src); }
|
||||||
#if GTEST_OS_QURT
|
|
||||||
// QuRT doesn't support any directory functions, including rmdir
|
|
||||||
inline int RmDir(const char*) { return 0; }
|
|
||||||
#else
|
|
||||||
inline int RmDir(const char* dir) { return rmdir(dir); }
|
|
||||||
#endif
|
|
||||||
inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
|
|
||||||
|
|
||||||
#endif // GTEST_OS_WINDOWS
|
#endif // GTEST_OS_WINDOWS
|
||||||
|
|
||||||
@ -2044,7 +2068,7 @@ GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
|
|||||||
// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
|
// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
|
||||||
// StrError() aren't needed on Windows CE at this time and thus not
|
// StrError() aren't needed on Windows CE at this time and thus not
|
||||||
// defined there.
|
// defined there.
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && \
|
#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && \
|
||||||
!GTEST_OS_WINDOWS_RT && !GTEST_OS_ESP8266 && !GTEST_OS_XTENSA && \
|
!GTEST_OS_WINDOWS_RT && !GTEST_OS_ESP8266 && !GTEST_OS_XTENSA && \
|
||||||
!GTEST_OS_QURT
|
!GTEST_OS_QURT
|
||||||
@ -2066,7 +2090,7 @@ inline FILE* FReopen(const char* path, const char* mode, FILE* stream) {
|
|||||||
return freopen(path, mode, stream);
|
return freopen(path, mode, stream);
|
||||||
}
|
}
|
||||||
inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
|
inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
|
||||||
#endif
|
#endif // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
|
||||||
inline int FClose(FILE* fp) { return fclose(fp); }
|
inline int FClose(FILE* fp) { return fclose(fp); }
|
||||||
#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
|
#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
|
||||||
inline int Read(int fd, void* buf, unsigned int count) {
|
inline int Read(int fd, void* buf, unsigned int count) {
|
||||||
@ -2076,8 +2100,13 @@ inline int Write(int fd, const void* buf, unsigned int count) {
|
|||||||
return static_cast<int>(write(fd, buf, count));
|
return static_cast<int>(write(fd, buf, count));
|
||||||
}
|
}
|
||||||
inline int Close(int fd) { return close(fd); }
|
inline int Close(int fd) { return close(fd); }
|
||||||
|
#endif // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
|
#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
|
||||||
inline const char* StrError(int errnum) { return strerror(errnum); }
|
inline const char* StrError(int errnum) { return strerror(errnum); }
|
||||||
#endif
|
#endif // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
|
||||||
|
|
||||||
inline const char* GetEnv(const char* name) {
|
inline const char* GetEnv(const char* name) {
|
||||||
#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
|
#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
|
||||||
GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA || \
|
GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA || \
|
||||||
|
@ -57,6 +57,8 @@
|
|||||||
#define GTEST_PATH_MAX_ _POSIX_PATH_MAX
|
#define GTEST_PATH_MAX_ _POSIX_PATH_MAX
|
||||||
#endif // GTEST_OS_WINDOWS
|
#endif // GTEST_OS_WINDOWS
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
namespace testing {
|
namespace testing {
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|
||||||
@ -404,3 +406,5 @@ void FilePath::Normalize() {
|
|||||||
|
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
} // namespace testing
|
} // namespace testing
|
||||||
|
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
@ -396,9 +396,11 @@ class GTEST_API_ UnitTestOptions {
|
|||||||
static bool MatchesFilter(const std::string& name, const char* filter);
|
static bool MatchesFilter(const std::string& name, const char* filter);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
// Returns the current application's name, removing directory path if that
|
// Returns the current application's name, removing directory path if that
|
||||||
// is present. Used by UnitTestOptions::GetOutputFile.
|
// is present. Used by UnitTestOptions::GetOutputFile.
|
||||||
GTEST_API_ FilePath GetCurrentExecutableName();
|
GTEST_API_ FilePath GetCurrentExecutableName();
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
// The role interface for getting the OS stack trace as a string.
|
// The role interface for getting the OS stack trace as a string.
|
||||||
class OsStackTraceGetterInterface {
|
class OsStackTraceGetterInterface {
|
||||||
@ -840,9 +842,11 @@ class GTEST_API_ UnitTestImpl {
|
|||||||
// The UnitTest object that owns this implementation object.
|
// The UnitTest object that owns this implementation object.
|
||||||
UnitTest* const parent_;
|
UnitTest* const parent_;
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
// The working directory when the first TEST() or TEST_F() was
|
// The working directory when the first TEST() or TEST_F() was
|
||||||
// executed.
|
// executed.
|
||||||
internal::FilePath original_working_dir_;
|
internal::FilePath original_working_dir_;
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
// The default test part result reporters.
|
// The default test part result reporters.
|
||||||
DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
|
DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
|
||||||
|
@ -58,6 +58,7 @@
|
|||||||
#include "gtest/gtest-assertion-result.h"
|
#include "gtest/gtest-assertion-result.h"
|
||||||
#include "gtest/gtest-spi.h"
|
#include "gtest/gtest-spi.h"
|
||||||
#include "gtest/internal/custom/gtest.h"
|
#include "gtest/internal/custom/gtest.h"
|
||||||
|
#include "gtest/internal/gtest-port.h"
|
||||||
|
|
||||||
#if GTEST_OS_LINUX
|
#if GTEST_OS_LINUX
|
||||||
|
|
||||||
@ -194,6 +195,7 @@ const char kStackTraceMarker[] = "\nStack trace:\n";
|
|||||||
// is specified on the command line.
|
// is specified on the command line.
|
||||||
bool g_help_flag = false;
|
bool g_help_flag = false;
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
// Utility function to Open File for Writing
|
// Utility function to Open File for Writing
|
||||||
static FILE* OpenFileForWriting(const std::string& output_file) {
|
static FILE* OpenFileForWriting(const std::string& output_file) {
|
||||||
FILE* fileout = nullptr;
|
FILE* fileout = nullptr;
|
||||||
@ -208,6 +210,7 @@ static FILE* OpenFileForWriting(const std::string& output_file) {
|
|||||||
}
|
}
|
||||||
return fileout;
|
return fileout;
|
||||||
}
|
}
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
|
|
||||||
@ -620,6 +623,7 @@ static ::std::vector<std::string> g_argvs;
|
|||||||
#endif // defined(GTEST_CUSTOM_GET_ARGVS_)
|
#endif // defined(GTEST_CUSTOM_GET_ARGVS_)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
// Returns the current application's name, removing directory path if that
|
// Returns the current application's name, removing directory path if that
|
||||||
// is present.
|
// is present.
|
||||||
FilePath GetCurrentExecutableName() {
|
FilePath GetCurrentExecutableName() {
|
||||||
@ -633,6 +637,7 @@ FilePath GetCurrentExecutableName() {
|
|||||||
|
|
||||||
return result.RemoveDirectoryName();
|
return result.RemoveDirectoryName();
|
||||||
}
|
}
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
// Functions for processing the gtest_output flag.
|
// Functions for processing the gtest_output flag.
|
||||||
|
|
||||||
@ -647,6 +652,7 @@ std::string UnitTestOptions::GetOutputFormat() {
|
|||||||
static_cast<size_t>(colon - gtest_output_flag));
|
static_cast<size_t>(colon - gtest_output_flag));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
// Returns the name of the requested output file, or the default if none
|
// Returns the name of the requested output file, or the default if none
|
||||||
// was explicitly specified.
|
// was explicitly specified.
|
||||||
std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
|
std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
|
||||||
@ -677,6 +683,7 @@ std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
|
|||||||
GetOutputFormat().c_str()));
|
GetOutputFormat().c_str()));
|
||||||
return result.string();
|
return result.string();
|
||||||
}
|
}
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
// Returns true if and only if the wildcard pattern matches the string. Each
|
// Returns true if and only if the wildcard pattern matches the string. Each
|
||||||
// pattern consists of regular characters, single-character wildcards (?), and
|
// pattern consists of regular characters, single-character wildcards (?), and
|
||||||
@ -3262,7 +3269,12 @@ static void ColoredPrintf(GTestColor color, const char* fmt, ...) {
|
|||||||
va_start(args, fmt);
|
va_start(args, fmt);
|
||||||
|
|
||||||
static const bool in_color_mode =
|
static const bool in_color_mode =
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
|
ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
|
||||||
|
#else
|
||||||
|
false;
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
const bool use_color = in_color_mode && (color != GTestColor::kDefault);
|
const bool use_color = in_color_mode && (color != GTestColor::kDefault);
|
||||||
|
|
||||||
if (!use_color) {
|
if (!use_color) {
|
||||||
@ -3867,6 +3879,7 @@ void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,
|
|||||||
|
|
||||||
// End TestEventRepeater
|
// End TestEventRepeater
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
// This class generates an XML output file.
|
// This class generates an XML output file.
|
||||||
class XmlUnitTestResultPrinter : public EmptyTestEventListener {
|
class XmlUnitTestResultPrinter : public EmptyTestEventListener {
|
||||||
public:
|
public:
|
||||||
@ -4414,7 +4427,9 @@ void XmlUnitTestResultPrinter::OutputXmlTestProperties(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// End XmlUnitTestResultPrinter
|
// End XmlUnitTestResultPrinter
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
// This class generates an JSON output file.
|
// This class generates an JSON output file.
|
||||||
class JsonUnitTestResultPrinter : public EmptyTestEventListener {
|
class JsonUnitTestResultPrinter : public EmptyTestEventListener {
|
||||||
public:
|
public:
|
||||||
@ -4855,6 +4870,7 @@ std::string JsonUnitTestResultPrinter::TestPropertiesAsJson(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// End JsonUnitTestResultPrinter
|
// End JsonUnitTestResultPrinter
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
#if GTEST_CAN_STREAM_RESULTS_
|
#if GTEST_CAN_STREAM_RESULTS_
|
||||||
|
|
||||||
@ -4993,6 +5009,7 @@ void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) {
|
|||||||
#endif // GTEST_HAS_ABSL
|
#endif // GTEST_HAS_ABSL
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if GTEST_HAS_DEATH_TEST
|
||||||
// A helper class that creates the premature-exit file in its
|
// A helper class that creates the premature-exit file in its
|
||||||
// constructor and deletes the file in its destructor.
|
// constructor and deletes the file in its destructor.
|
||||||
class ScopedPrematureExitFile {
|
class ScopedPrematureExitFile {
|
||||||
@ -5030,6 +5047,7 @@ class ScopedPrematureExitFile {
|
|||||||
ScopedPrematureExitFile(const ScopedPrematureExitFile&) = delete;
|
ScopedPrematureExitFile(const ScopedPrematureExitFile&) = delete;
|
||||||
ScopedPrematureExitFile& operator=(const ScopedPrematureExitFile&) = delete;
|
ScopedPrematureExitFile& operator=(const ScopedPrematureExitFile&) = delete;
|
||||||
};
|
};
|
||||||
|
#endif // GTEST_HAS_DEATH_TEST
|
||||||
|
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
|
|
||||||
@ -5355,6 +5373,7 @@ void UnitTest::RecordProperty(const std::string& key,
|
|||||||
// We don't protect this under mutex_, as we only support calling it
|
// We don't protect this under mutex_, as we only support calling it
|
||||||
// from the main thread.
|
// from the main thread.
|
||||||
int UnitTest::Run() {
|
int UnitTest::Run() {
|
||||||
|
#if GTEST_HAS_DEATH_TEST
|
||||||
const bool in_death_test_child_process =
|
const bool in_death_test_child_process =
|
||||||
GTEST_FLAG_GET(internal_run_death_test).length() > 0;
|
GTEST_FLAG_GET(internal_run_death_test).length() > 0;
|
||||||
|
|
||||||
@ -5383,6 +5402,7 @@ int UnitTest::Run() {
|
|||||||
in_death_test_child_process
|
in_death_test_child_process
|
||||||
? nullptr
|
? nullptr
|
||||||
: internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
|
: internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
|
||||||
|
#endif // GTEST_HAS_DEATH_TEST
|
||||||
|
|
||||||
// Captures the value of GTEST_FLAG(catch_exceptions). This value will be
|
// Captures the value of GTEST_FLAG(catch_exceptions). This value will be
|
||||||
// used for the duration of the program.
|
// used for the duration of the program.
|
||||||
@ -5438,11 +5458,13 @@ int UnitTest::Run() {
|
|||||||
: 1;
|
: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
// Returns the working directory when the first TEST() or TEST_F() was
|
// Returns the working directory when the first TEST() or TEST_F() was
|
||||||
// executed.
|
// executed.
|
||||||
const char* UnitTest::original_working_dir() const {
|
const char* UnitTest::original_working_dir() const {
|
||||||
return impl_->original_working_dir_.c_str();
|
return impl_->original_working_dir_.c_str();
|
||||||
}
|
}
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
// Returns the TestSuite object for the test that's currently running,
|
// Returns the TestSuite object for the test that's currently running,
|
||||||
// or NULL if no test is running.
|
// or NULL if no test is running.
|
||||||
@ -5575,6 +5597,7 @@ void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
|
|||||||
// UnitTestOptions. Must not be called before InitGoogleTest.
|
// UnitTestOptions. Must not be called before InitGoogleTest.
|
||||||
void UnitTestImpl::ConfigureXmlOutput() {
|
void UnitTestImpl::ConfigureXmlOutput() {
|
||||||
const std::string& output_format = UnitTestOptions::GetOutputFormat();
|
const std::string& output_format = UnitTestOptions::GetOutputFormat();
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
if (output_format == "xml") {
|
if (output_format == "xml") {
|
||||||
listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
|
listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
|
||||||
UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
|
UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
|
||||||
@ -5585,6 +5608,10 @@ void UnitTestImpl::ConfigureXmlOutput() {
|
|||||||
GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \""
|
GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \""
|
||||||
<< output_format << "\" ignored.";
|
<< output_format << "\" ignored.";
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
GTEST_LOG_(ERROR) << "ERROR: alternative output formats require "
|
||||||
|
<< "GTEST_HAS_FILE_SYSTEM to be enabled";
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
}
|
}
|
||||||
|
|
||||||
#if GTEST_CAN_STREAM_RESULTS_
|
#if GTEST_CAN_STREAM_RESULTS_
|
||||||
@ -5747,10 +5774,12 @@ bool UnitTestImpl::RunAllTests() {
|
|||||||
// user didn't call InitGoogleTest.
|
// user didn't call InitGoogleTest.
|
||||||
PostFlagParsingInit();
|
PostFlagParsingInit();
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
// Even if sharding is not on, test runners may want to use the
|
// Even if sharding is not on, test runners may want to use the
|
||||||
// GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
|
// GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
|
||||||
// protocol.
|
// protocol.
|
||||||
internal::WriteToShardStatusFileIfNeeded();
|
internal::WriteToShardStatusFileIfNeeded();
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
// True if and only if we are in a subprocess for running a thread-safe-style
|
// True if and only if we are in a subprocess for running a thread-safe-style
|
||||||
// death test.
|
// death test.
|
||||||
@ -5930,6 +5959,7 @@ bool UnitTestImpl::RunAllTests() {
|
|||||||
return !failed;
|
return !failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
|
// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
|
||||||
// if the variable is present. If a file already exists at this location, this
|
// if the variable is present. If a file already exists at this location, this
|
||||||
// function will write over it. If the variable is present, but the file cannot
|
// function will write over it. If the variable is present, but the file cannot
|
||||||
@ -5949,6 +5979,7 @@ void WriteToShardStatusFileIfNeeded() {
|
|||||||
fclose(file);
|
fclose(file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
// Checks whether sharding is enabled by examining the relevant
|
// Checks whether sharding is enabled by examining the relevant
|
||||||
// environment variable values. If the variables are present,
|
// environment variable values. If the variables are present,
|
||||||
@ -6140,6 +6171,7 @@ void UnitTestImpl::ListTestsMatchingFilter() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
|
#if GTEST_HAS_FILE_SYSTEM
|
||||||
const std::string& output_format = UnitTestOptions::GetOutputFormat();
|
const std::string& output_format = UnitTestOptions::GetOutputFormat();
|
||||||
if (output_format == "xml" || output_format == "json") {
|
if (output_format == "xml" || output_format == "json") {
|
||||||
FILE* fileout = OpenFileForWriting(
|
FILE* fileout = OpenFileForWriting(
|
||||||
@ -6157,6 +6189,7 @@ void UnitTestImpl::ListTestsMatchingFilter() {
|
|||||||
fprintf(fileout, "%s", StringStreamToString(&stream).c_str());
|
fprintf(fileout, "%s", StringStreamToString(&stream).c_str());
|
||||||
fclose(fileout);
|
fclose(fileout);
|
||||||
}
|
}
|
||||||
|
#endif // GTEST_HAS_FILE_SYSTEM
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sets the OS stack trace getter.
|
// Sets the OS stack trace getter.
|
||||||
@ -6545,7 +6578,7 @@ static bool ParseGoogleTestFlag(const char* const arg) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if GTEST_USE_OWN_FLAGFILE_FLAG_
|
#if GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
|
||||||
static void LoadFlagsFromFile(const std::string& path) {
|
static void LoadFlagsFromFile(const std::string& path) {
|
||||||
FILE* flagfile = posix::FOpen(path.c_str(), "r");
|
FILE* flagfile = posix::FOpen(path.c_str(), "r");
|
||||||
if (!flagfile) {
|
if (!flagfile) {
|
||||||
@ -6561,7 +6594,7 @@ static void LoadFlagsFromFile(const std::string& path) {
|
|||||||
if (!ParseGoogleTestFlag(lines[i].c_str())) g_help_flag = true;
|
if (!ParseGoogleTestFlag(lines[i].c_str())) g_help_flag = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif // GTEST_USE_OWN_FLAGFILE_FLAG_
|
#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
|
||||||
|
|
||||||
// Parses the command line for Google Test flags, without initializing
|
// Parses the command line for Google Test flags, without initializing
|
||||||
// other parts of Google Test. The type parameter CharType can be
|
// other parts of Google Test. The type parameter CharType can be
|
||||||
@ -6578,12 +6611,12 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
|
|||||||
bool remove_flag = false;
|
bool remove_flag = false;
|
||||||
if (ParseGoogleTestFlag(arg)) {
|
if (ParseGoogleTestFlag(arg)) {
|
||||||
remove_flag = true;
|
remove_flag = true;
|
||||||
#if GTEST_USE_OWN_FLAGFILE_FLAG_
|
#if GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
|
||||||
} else if (ParseFlag(arg, "flagfile", &flagfile_value)) {
|
} else if (ParseFlag(arg, "flagfile", &flagfile_value)) {
|
||||||
GTEST_FLAG_SET(flagfile, flagfile_value);
|
GTEST_FLAG_SET(flagfile, flagfile_value);
|
||||||
LoadFlagsFromFile(flagfile_value);
|
LoadFlagsFromFile(flagfile_value);
|
||||||
remove_flag = true;
|
remove_flag = true;
|
||||||
#endif // GTEST_USE_OWN_FLAGFILE_FLAG_
|
#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
|
||||||
} else if (arg_string == "--help" || HasGoogleTestFlagPrefix(arg)) {
|
} else if (arg_string == "--help" || HasGoogleTestFlagPrefix(arg)) {
|
||||||
// Both help flag and unrecognized Google Test flags (excluding
|
// Both help flag and unrecognized Google Test flags (excluding
|
||||||
// internal ones) trigger help display.
|
// internal ones) trigger help display.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user