<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194501] trunk/Source/ThirdParty</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194501">194501</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-02 12:08:38 -0800 (Sat, 02 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove usage of environ in gtest
https://bugs.webkit.org/show_bug.cgi?id=138420
Patch by Ting-Wei Lan <lantw44@gmail.com> on 2016-01-02
Reviewed by Michael Catanzaro.
FreeBSD libc.so.7 does not contain an environ symbol, which causes
undefined reference problem when using -Wl,--no-undefined. As gtest
only uses environ as an argument to call execve, we can simply remove
its usage by replacing execve with execv.
* gtest/src/gtest-death-test.cc:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyChangeLog">trunk/Source/ThirdParty/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartygtestREADMEWebKit">trunk/Source/ThirdParty/gtest/README.WebKit</a></li>
<li><a href="#trunkSourceThirdPartygtestsrcgtestdeathtestcc">trunk/Source/ThirdParty/gtest/src/gtest-death-test.cc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ChangeLog (194500 => 194501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ChangeLog        2016-01-02 19:42:22 UTC (rev 194500)
+++ trunk/Source/ThirdParty/ChangeLog        2016-01-02 20:08:38 UTC (rev 194501)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-02 Ting-Wei Lan <lantw44@gmail.com>
+
+ Remove usage of environ in gtest
+ https://bugs.webkit.org/show_bug.cgi?id=138420
+
+ Reviewed by Michael Catanzaro.
+
+ FreeBSD libc.so.7 does not contain an environ symbol, which causes
+ undefined reference problem when using -Wl,--no-undefined. As gtest
+ only uses environ as an argument to call execve, we can simply remove
+ its usage by replacing execve with execv.
+
+ * gtest/src/gtest-death-test.cc:
+
</ins><span class="cx"> 2015-12-01 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Mountain Lion support from gtest
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestREADMEWebKit"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/README.WebKit (194500 => 194501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/README.WebKit        2016-01-02 19:42:22 UTC (rev 194500)
+++ trunk/Source/ThirdParty/gtest/README.WebKit        2016-01-02 20:08:38 UTC (rev 194501)
</span><span class="lines">@@ -2,6 +2,9 @@
</span><span class="cx">
</span><span class="cx"> http://googletest.googlecode.com/svn/tags/release-1.5.0/
</span><span class="cx">
</span><ins>+2016-01-02 Ting-Wei Lan (lantw44@gmail.com)
+ Remove usage of environ global variable to fix the build on FreeBSD.
+
</ins><span class="cx"> 2012-01-04 Dmitry Lomov (dslomov@google.com) David Kilzer (ddkilzer@apple.com)
</span><span class="cx"> - WebKit port of gtest uses FastMalloc "new" and "delete" operators from JavaScriptCore.
</span><span class="cx"> - The gtest.framework target now links to JavaScriptCore.framework.
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestsrcgtestdeathtestcc"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/src/gtest-death-test.cc (194500 => 194501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/src/gtest-death-test.cc        2016-01-02 19:42:22 UTC (rev 194500)
+++ trunk/Source/ThirdParty/gtest/src/gtest-death-test.cc        2016-01-02 20:08:38 UTC (rev 194501)
</span><span class="lines">@@ -832,20 +832,6 @@
</span><span class="cx"> int close_fd; // File descriptor to close; the read end of a pipe
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> // The main function for a threadsafe-style death test child process.
</span><span class="cx"> // This function is called in a clone()-ed process and thus must avoid
</span><span class="cx"> // any potentially unsafe operations like malloc or libc functions.
</span><span class="lines">@@ -871,8 +857,11 @@
</span><span class="cx"> // unsafe. Since execve() doesn't search the PATH, the user must
</span><span class="cx"> // invoke the test program via a valid path that contains at least
</span><span class="cx"> // one path separator.
</span><del>- execve(args->argv[0], args->argv, GetEnviron());
- DeathTestAbort(String::Format("execve(%s, ...) in %s failed: %s",
</del><ins>+ // 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(String::Format("execv(%s, ...) in %s failed: %s",
</ins><span class="cx"> args->argv[0],
</span><span class="cx"> original_dir,
</span><span class="cx"> GetLastErrnoDescription().c_str()));
</span></span></pre>
</div>
</div>
</body>
</html>