<!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>[214945] 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/214945">214945</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2017-04-05 07:28:57 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add debug option to run-jsc script
https://bugs.webkit.org/show_bug.cgi?id=170503
Reviewed by Yusuke Suzuki.
Adds a new option to the run-jsc script so that when passed
"--debug" it will wrap the jsc call with an lldb invocation. If
someone wishes to use a different debugger they can set the
DEBUGGER environment variable. Additionally, run-jsc now exits
with the exit status of the jsc call.
* Scripts/run-jsc:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjsc">trunk/Tools/Scripts/run-jsc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214944 => 214945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-04-05 13:36:47 UTC (rev 214944)
+++ trunk/Tools/ChangeLog 2017-04-05 14:28:57 UTC (rev 214945)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-04-05 Keith Miller <keith_miller@apple.com>
+
+ Add debug option to run-jsc script
+ https://bugs.webkit.org/show_bug.cgi?id=170503
+
+ Reviewed by Yusuke Suzuki.
+
+ Adds a new option to the run-jsc script so that when passed
+ "--debug" it will wrap the jsc call with an lldb invocation. If
+ someone wishes to use a different debugger they can set the
+ DEBUGGER environment variable. Additionally, run-jsc now exits
+ with the exit status of the jsc call.
+
+ * Scripts/run-jsc:
+
</ins><span class="cx"> 2017-04-05 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r202472): Data Detection overwrites existing links in detected ranges
</span></span></pre></div>
<a id="trunkToolsScriptsrunjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc (214944 => 214945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc 2017-04-05 13:36:47 UTC (rev 214944)
+++ trunk/Tools/Scripts/run-jsc 2017-04-05 14:28:57 UTC (rev 214945)
</span><span class="lines">@@ -37,22 +37,30 @@
</span><span class="cx"> use webkitdirs;
</span><span class="cx"> Getopt::Long::Configure("pass_through");
</span><span class="cx">
</span><del>-my $usage = "Usage: run-jsc [--count run_count] shell_file [file2...]";
</del><ins>+my $usage = "Usage: run-jsc [--count run_count] [--debug] shell_file [file2...]";
</ins><span class="cx">
</span><span class="cx"> my $count = 1;
</span><ins>+my $debug = 0;
+
</ins><span class="cx"> GetOptions("count|c=i" => \$count);
</span><ins>+GetOptions("debug" => \$debug);
</ins><span class="cx">
</span><span class="cx"> setConfiguration();
</span><span class="cx">
</span><del>-my $jsc = File::Spec->catfile(jscProductDir(), "jsc ") . "@ARGV";
</del><ins>+my $jsc;
+if ($debug) {
+ my $debugger = defined($ENV{"DEBUGGER"}) ? $ENV{"DEBUGGER"} : "lldb";
+ $jsc = $debugger . " " . File::Spec->catfile(jscProductDir(), "jsc -- ") . "@ARGV";
+} else {
+ $jsc = File::Spec->catfile(jscProductDir(), "jsc ") . "@ARGV";
+}
</ins><span class="cx">
</span><span class="cx"> my $dyld = jscProductDir();
</span><span class="cx">
</span><span class="cx"> $ENV{"DYLD_FRAMEWORK_PATH"} = $dyld;
</span><span class="cx"> print STDERR "Running $count time(s): DYLD_FRAMEWORK_PATH=$dyld $jsc\n";
</span><ins>+
</ins><span class="cx"> while ($count--) {
</span><del>- if (system("$jsc") != 0) {
- last;
- }
</del><ins>+ my $status = system("$jsc") >> 8;
+ exit $status if $status != 0;
</ins><span class="cx"> }
</span><del>-
</del></span></pre>
</div>
</div>
</body>
</html>