Unverified Commit ad383b27 authored by Conor Burgess's avatar Conor Burgess Committed by GitHub
Browse files

Fix value pointed to by `_NSGetArgc()` on macOS

parent a868e618
......@@ -146,6 +146,12 @@
# define vsnprintf _vsnprintf
#endif // GTEST_OS_WINDOWS
#if GTEST_OS_MAC
# ifndef GTEST_OS_IOS
# include <crt_externs.h>
# endif
#endif
namespace testing {
using internal::CountIf;
......@@ -5341,6 +5347,16 @@ 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) {
// 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment