eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix location of _NSGetArgv correction.

Browse Source
This commit is contained in:
Conor Burgess 2017-12-07 11:49:33 +00:00 committed by GitHub
parent ad383b274d
commit 4d50715c2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
googletest/src/gtest.cc
View File

@ -5347,16 +5347,6 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
} }
} }
// Fix the value of *_NSGetArgc() on macOS, but iff
// *_NSGetArgv() == argv
#if GTEST_OS_MAC
# ifndef GTEST_OS_IOS
if (*_NSGetArgv() == argv) {
*_NSGetArgc() = *argc;
}
# endif
#endif
if (g_help_flag) { if (g_help_flag) {
// We print the help here instead of in RUN_ALL_TESTS(), as the // We print the help here instead of in RUN_ALL_TESTS(), as the
// latter may not be called at all if the user is using Google // latter may not be called at all if the user is using Google
@ -5369,6 +5359,17 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
// other parts of Google Test. // other parts of Google Test.
void ParseGoogleTestFlagsOnly(int* argc, char** argv) { void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
ParseGoogleTestFlagsOnlyImpl(argc, argv); ParseGoogleTestFlagsOnlyImpl(argc, argv);
// Fix the value of *_NSGetArgc() on macOS, but iff
// *_NSGetArgv() == argv
// Only applicable to char** version of argv
#if GTEST_OS_MAC
# ifndef GTEST_OS_IOS
if (*_NSGetArgv() == argv) {
*_NSGetArgc() = *argc;
}
# endif
#endif
} }
void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) { void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
ParseGoogleTestFlagsOnlyImpl(argc, argv); ParseGoogleTestFlagsOnlyImpl(argc, argv);