Changeset 257691 in webkit

Timestamp:

Mar 1, 2020 10:24:29 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Re-add the patch used to work around gtest linking failure on FreeBSD
​https://bugs.webkit.org/show_bug.cgi?id=208409

Patch by Ting-Wei Lan <Ting-Wei Lan> on 2020-03-01
Reviewed by Michael Catanzaro.

The patch was added in ​https://bugs.webkit.org/show_bug.cgi?id=138420 to
fix gtest linking error on FreeBSD. However, it was accidentally dropped
in r235613, the commit updating gtest, causing the error to happen
again. Re-add it to fix the build on FreeBSD.

• gtest/src/gtest-death-test.cc:

Location:

trunk/Source/ThirdParty

Files:

• ChangeLog (modified) (1 diff)
• gtest/README.WebKit (added)
• gtest/changes.diff (added)
• gtest/src/gtest-death-test.cc (modified) (2 diffs)

trunk/Source/ThirdParty/ChangeLog

@@ +1 @@
+2020-03-01  Ting-Wei Lan  <lantw44@gmail.com>
+
+        Re-add the patch used to work around gtest linking failure on FreeBSD
+        https://bugs.webkit.org/show_bug.cgi?id=208409
+
+        Reviewed by Michael Catanzaro.
+
+        The patch was added in https://bugs.webkit.org/show_bug.cgi?id=138420 to
+        fix gtest linking error on FreeBSD. However, it was accidentally dropped
+        in r235613, the commit updating gtest, causing the error to happen
+        again. Re-add it to fix the build on FreeBSD.
+
+        * gtest/src/gtest-death-test.cc:
+
 2020-01-24  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/ThirdParty/gtest/src/gtest-death-test.cc

@@ -1153 +1153 @@
 };
 
-#  if GTEST_OS_MAC
-inline char** GetEnviron() {
-  // When Google Test is built as a framework on MacOS X, the environ variable
-  // is unavailable. Apple's documentation (man environ) recommends using
-  // _NSGetEnviron() instead.
-  return *_NSGetEnviron();
-}
-#  else
-// Some POSIX platforms expect you to declare environ. extern "C" makes
-// it reside in the global namespace.
-extern "C" char** environ;
-inline char** GetEnviron() { return environ; }
-#  endif  // GTEST_OS_MAC
-
 #  if !GTEST_OS_QNX
 // The main function for a threadsafe-style death test child process.
@@ -1192 +1178 @@
   // invoke the test program via a valid path that contains at least
   // one path separator.
-  execve(args->argv[0], args->argv, GetEnviron());
-  DeathTestAbort(std::string("execve(") + args->argv[0] + ", ...) in " +
+  // We have replaced execve() with execv() for WebKit to avoid using
+  // environ. It should be safe because execv() is just a simple wrapper
+  // of execve().
+  execv(args->argv[0], args->argv);
+  DeathTestAbort(std::string("execv(") + args->argv[0] + ", ...) in " +
                  original_dir + " failed: " +
                  GetLastErrnoDescription());