<!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>[245981] trunk/Tools</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/245981">245981</a></dd>
<dt>Author</dt> <dd>dewei_zhu@apple.com</dd>
<dt>Date</dt> <dd>2019-05-31 13:52:31 -0700 (Fri, 31 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>run-benchmark should report an error if the argument to --build-directory is bogus
https://bugs.webkit.org/show_bug.cgi?id=198316

Reviewed by Ryosuke Niwa.

'run-benchmark' should not fallback to system safari when browser or browser build path is
specified but not valid.
Add a run-time check to ensure at least one of the resource from build directory is opened by
Safari when build directory is specified.

* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver.launch_url): Raise an exception when browser or browser build path is
specified but not valid.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_safari_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (245980 => 245981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-05-31 20:23:31 UTC (rev 245980)
+++ trunk/Tools/ChangeLog       2019-05-31 20:52:31 UTC (rev 245981)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2019-05-28  Dewei Zhu  <dewei_zhu@apple.com>
+
+        run-benchmark should report an error if the argument to --build-directory is bogus
+        https://bugs.webkit.org/show_bug.cgi?id=198316
+
+        Reviewed by Ryosuke Niwa.
+
+        'run-benchmark' should not fallback to system safari when browser or browser build path is
+        specified but not valid.
+        Add a run-time check to ensure at least one of the resource from build directory is opened by
+        Safari when build directory is specified.
+
+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+        (OSXSafariDriver.launch_url): Raise an exception when browser or browser build path is
+        specified but not valid.
+
</ins><span class="cx"> 2019-05-31  Tim Horton  <timothy_horton@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Optionally respect device management restrictions when loading from the network
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_safari_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (245980 => 245981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py        2019-05-31 20:23:31 UTC (rev 245980)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py   2019-05-31 20:52:31 UTC (rev 245981)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx"> 
</span><ins>+import itertools
</ins><span class="cx"> import logging
</span><span class="cx"> import os
</span><span class="cx"> import subprocess
</span><span class="lines">@@ -27,18 +28,27 @@
</span><span class="cx">         args = ['/Applications/Safari.app/Contents/MacOS/Safari']
</span><span class="cx">         env = {}
</span><span class="cx">         if browser_build_path:
</span><del>-            safari_app_in_build_path = os.path.join(browser_build_path, 'Safari.app/Contents/MacOS/Safari')
-            if os.path.exists(safari_app_in_build_path):
</del><ins>+            browser_build_absolute_path = os.path.abspath(browser_build_path)
+            safari_app_in_build_path = os.path.join(browser_build_absolute_path, 'Safari.app/Contents/MacOS/Safari')
+            has_safari_app = os.path.exists(safari_app_in_build_path)
+            content_in_path = os.listdir(browser_build_absolute_path)
+            contains_frameworks = any(itertools.imap(lambda entry: entry.endswith('.framework'), os.listdir(browser_build_absolute_path)))
+
+            if has_safari_app:
</ins><span class="cx">                 args = [safari_app_in_build_path]
</span><del>-                env = {'DYLD_FRAMEWORK_PATH': browser_build_path, 'DYLD_LIBRARY_PATH': browser_build_path, '__XPC_DYLD_FRAMEWORK_PATH': browser_build_path, '__XPC_DYLD_LIBRARY_PATH': browser_build_path}
-            else:
-                _log.info('Could not find Safari.app at %s, using the system Safari instead' % safari_app_in_build_path)
</del><ins>+
+            if contains_frameworks:
+                env = {'DYLD_FRAMEWORK_PATH': browser_build_absolute_path, 'DYLD_LIBRARY_PATH': browser_build_absolute_path,
+                    '__XPC_DYLD_FRAMEWORK_PATH': browser_build_absolute_path, '__XPC_DYLD_LIBRARY_PATH': browser_build_absolute_path}
+            elif not has_safari_app:
+                raise Exception('Could not find any framework "{}"'.format(browser_build_path))
+
</ins><span class="cx">         elif browser_path:
</span><span class="cx">             safari_app_in_browser_path = os.path.join(browser_path, 'Contents/MacOS/Safari')
</span><span class="cx">             if os.path.exists(safari_app_in_browser_path):
</span><span class="cx">                 args = [safari_app_in_browser_path]
</span><span class="cx">             else:
</span><del>-                _log.info('Could not find application at %s, using the system Safari instead' % safari_app_in_browser_path)
</del><ins>+                raise Exception('Could not find Safari.app at {}'.format(safari_app_in_browser_path))
</ins><span class="cx"> 
</span><span class="cx">         args.extend(self._safari_preferences)
</span><span class="cx">         _log.info('Launching safari: %s with url: %s' % (args[0], url))
</span><span class="lines">@@ -47,6 +57,18 @@
</span><span class="cx">         # Stop for initialization of the safari process, otherwise, open
</span><span class="cx">         # command may use the system safari.
</span><span class="cx">         time.sleep(3)
</span><ins>+
+        if browser_build_path:
+            _log.info('Checking if any open file is from "{}".'.format(browser_build_path))
+            # Cannot use 'check_call' here as '+D' option will have non-zero return code when not all files under
+            # specified folder are used.
+            process = subprocess.Popen(['/usr/sbin/lsof', '-a', '-p', str(self._safari_process.pid), '+D', browser_build_absolute_path], stdout=subprocess.PIPE)
+            output = process.communicate()[0]
+            if has_safari_app:
+                assert 'Safari.app/Contents/MacOS/Safari' in output, 'Safari.app is not launched from "{}"'.format(browser_build_path)
+            if contains_frameworks:
+                assert '.framework' in output, 'No framework is loaded from "{}"'.format(browser_build_path)
+
</ins><span class="cx">         subprocess.Popen(['open', '-a', args[0], url])
</span><span class="cx"> 
</span><span class="cx">     def launch_driver(self, url, options, browser_build_path):
</span></span></pre>
</div>
</div>

</body>
</html>