<!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>[184442] 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/184442">184442</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-05-17 10:36:36 -0700 (Sun, 17 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>bisect-builds: Add 'retry' option when prompting whether the bug reproduced
<http://webkit.org/b/145100>
Reviewed by Darin Adler.
* Scripts/bisect-builds:
- Add PROMPT_ANSWER_* constants for yes/no/retry/broken prompt.
- Switch to using PROMPT_RESPONSE_* constants when testing the
value of $didReproduceBug.
- Add do { } while loops to implement 'retry' mode.
(promptForTest):
- Switch to returning PROMPT_RESPONSE_* constants.
- Add support for 'retry' response.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbisectbuilds">trunk/Tools/Scripts/bisect-builds</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (184441 => 184442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-17 00:24:43 UTC (rev 184441)
+++ trunk/Tools/ChangeLog 2015-05-17 17:36:36 UTC (rev 184442)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-05-17 David Kilzer <ddkilzer@apple.com>
+
+ bisect-builds: Add 'retry' option when prompting whether the bug reproduced
+ <http://webkit.org/b/145100>
+
+ Reviewed by Darin Adler.
+
+ * Scripts/bisect-builds:
+ - Add PROMPT_ANSWER_* constants for yes/no/retry/broken prompt.
+ - Switch to using PROMPT_RESPONSE_* constants when testing the
+ value of $didReproduceBug.
+ - Add do { } while loops to implement 'retry' mode.
+ (promptForTest):
+ - Switch to returning PROMPT_RESPONSE_* constants.
+ - Add support for 'retry' response.
+
</ins><span class="cx"> 2015-05-16 Tanay C <tanay.c@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] Minibrowser : Add search icon to search bar
</span></span></pre></div>
<a id="trunkToolsScriptsbisectbuilds"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/bisect-builds (184441 => 184442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/bisect-builds 2015-05-17 00:24:43 UTC (rev 184441)
+++ trunk/Tools/Scripts/bisect-builds 2015-05-17 17:36:36 UTC (rev 184442)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/perl -w
</span><span class="cx">
</span><del>-# Copyright (C) 2007-2009, 2011-2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2007-2009, 2011-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -11,9 +11,6 @@
</span><span class="cx"> # 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> # notice, this list of conditions and the following disclaimer in the
</span><span class="cx"> # documentation and/or other materials provided with the distribution.
</span><del>-# 3. Neither the name of Apple Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
</del><span class="cx"> #
</span><span class="cx"> # THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</span><span class="cx"> # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="lines">@@ -50,6 +47,13 @@
</span><span class="cx"> use lib $FindBin::Bin;
</span><span class="cx"> use webkitdirs qw(safariPathFromSafariBundle);
</span><span class="cx">
</span><ins>+use constant {
+ PROMPT_RESPONSE_BROKEN => -1,
+ PROMPT_RESPONSE_NO => 0,
+ PROMPT_RESPONSE_RETRY => 2,
+ PROMPT_RESPONSE_YES => 1,
+};
+
</ins><span class="cx"> sub createTempFile($);
</span><span class="cx"> sub downloadNightly($$$);
</span><span class="cx"> sub findMacOSXVersion();
</span><span class="lines">@@ -152,27 +156,31 @@
</span><span class="cx"> printf "\nChecking starting revision r%s...\n",
</span><span class="cx"> $nightlies[$startIndex]->{rev};
</span><span class="cx"> downloadNightly($nightlies[$startIndex]->{file}, $nightlyFilesURLBase, $nightlyDownloadDirectory);
</span><del>- mountAndRunNightly($nightlies[$startIndex]->{file}, $nightlyDownloadDirectory, $safariPath, $tempFile);
- $didReproduceBug = promptForTest($nightlies[$startIndex]->{rev});
- $startIndex-- if $didReproduceBug < 0;
- } while ($didReproduceBug < 0);
</del><ins>+ do {
+ mountAndRunNightly($nightlies[$startIndex]->{file}, $nightlyDownloadDirectory, $safariPath, $tempFile);
+ $didReproduceBug = promptForTest($nightlies[$startIndex]->{rev});
+ } while ($didReproduceBug == PROMPT_RESPONSE_RETRY);
+ $startIndex-- if $didReproduceBug == PROMPT_RESPONSE_BROKEN;
+ } while ($didReproduceBug == PROMPT_RESPONSE_BROKEN);
</ins><span class="cx"> die "ERROR: Bug reproduced in starting revision! Do you need to test an earlier revision or for a progression?"
</span><del>- if $didReproduceBug && !$isProgression;
</del><ins>+ if $didReproduceBug == PROMPT_RESPONSE_YES && !$isProgression;
</ins><span class="cx"> die "ERROR: Bug not reproduced in starting revision! Do you need to test an earlier revision or for a regression?"
</span><del>- if !$didReproduceBug && $isProgression;
</del><ins>+ if $didReproduceBug == PROMPT_RESPONSE_NO && $isProgression;
</ins><span class="cx">
</span><span class="cx"> do {
</span><span class="cx"> printf "\nChecking ending revision r%s...\n",
</span><span class="cx"> $nightlies[$endIndex]->{rev};
</span><span class="cx"> downloadNightly($nightlies[$endIndex]->{file}, $nightlyFilesURLBase, $nightlyDownloadDirectory);
</span><del>- mountAndRunNightly($nightlies[$endIndex]->{file}, $nightlyDownloadDirectory, $safariPath, $tempFile);
- $didReproduceBug = promptForTest($nightlies[$endIndex]->{rev});
- $endIndex++ if $didReproduceBug < 0;
- } while ($didReproduceBug < 0);
</del><ins>+ do {
+ mountAndRunNightly($nightlies[$endIndex]->{file}, $nightlyDownloadDirectory, $safariPath, $tempFile);
+ $didReproduceBug = promptForTest($nightlies[$endIndex]->{rev});
+ } while ($didReproduceBug == PROMPT_RESPONSE_RETRY);
+ $endIndex++ if $didReproduceBug == PROMPT_RESPONSE_BROKEN;
+ } while ($didReproduceBug == PROMPT_RESPONSE_BROKEN);
</ins><span class="cx"> die "ERROR: Bug NOT reproduced in ending revision! Do you need to test a later revision or for a progression?"
</span><del>- if !$didReproduceBug && !$isProgression;
</del><ins>+ if $didReproduceBug == PROMPT_RESPONSE_NO && !$isProgression;
</ins><span class="cx"> die "ERROR: Bug reproduced in ending revision! Do you need to test a later revision or for a regression?"
</span><del>- if $didReproduceBug && $isProgression;
</del><ins>+ if $didReproduceBug == PROMPT_RESPONSE_YES && $isProgression;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> printStatus($nightlies[$startIndex]->{rev}, $nightlies[$endIndex]->{rev}, $isProgression);
</span><span class="lines">@@ -188,10 +196,12 @@
</span><span class="cx"> my $plural = $buildsLeft == 1 ? "" : "s";
</span><span class="cx"> printf "\nChecking revision r%s (%d build%s left to test after this)...\n", $nightlies[$index]->{rev}, $buildsLeft, $plural;
</span><span class="cx"> downloadNightly($nightlies[$index]->{file}, $nightlyFilesURLBase, $nightlyDownloadDirectory);
</span><del>- mountAndRunNightly($nightlies[$index]->{file}, $nightlyDownloadDirectory, $safariPath, $tempFile);
- $didReproduceBug = promptForTest($nightlies[$index]->{rev});
</del><ins>+ do {
+ mountAndRunNightly($nightlies[$index]->{file}, $nightlyDownloadDirectory, $safariPath, $tempFile);
+ $didReproduceBug = promptForTest($nightlies[$index]->{rev});
+ } while ($didReproduceBug == PROMPT_RESPONSE_RETRY);
</ins><span class="cx"> }
</span><del>- if ($didReproduceBug < 0) {
</del><ins>+ if ($didReproduceBug == PROMPT_RESPONSE_BROKEN) {
</ins><span class="cx"> $brokenRevisions{$nightlies[$index]->{rev}} = $nightlies[$index]->{file};
</span><span class="cx"> delete $nightlies[$index];
</span><span class="cx"> $endIndex--;
</span><span class="lines">@@ -203,9 +213,9 @@
</span><span class="cx"> $index = int(($index + $endIndex) / 2);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } while ($didReproduceBug < 0);
</del><ins>+ } while ($didReproduceBug == PROMPT_RESPONSE_BROKEN);
</ins><span class="cx">
</span><del>- if ($didReproduceBug && !$isProgression || !$didReproduceBug && $isProgression) {
</del><ins>+ if ($didReproduceBug == PROMPT_RESPONSE_YES && !$isProgression || $didReproduceBug == PROMPT_RESPONSE_NO && $isProgression) {
</ins><span class="cx"> $endIndex = $index;
</span><span class="cx"> } else {
</span><span class="cx"> $startIndex = $index;
</span><span class="lines">@@ -482,10 +492,11 @@
</span><span class="cx"> sub promptForTest($)
</span><span class="cx"> {
</span><span class="cx"> my ($revision) = @_;
</span><del>- print "Did the bug reproduce in r$revision (yes/no/broken)? ";
</del><ins>+ print "Did the bug reproduce in r$revision (yes/no/retry/broken)? ";
</ins><span class="cx"> my $answer = <STDIN>;
</span><del>- return 1 if $answer =~ /^(1|y.*)$/i;
- return -1 if $answer =~ /^(-1|b.*)$/i; # Broken
- return 0;
</del><ins>+ return PROMPT_RESPONSE_YES if $answer =~ /^(1|y.*)$/i;
+ return PROMPT_RESPONSE_RETRY if $answer =~ /^r.*/i;
+ return PROMPT_RESPONSE_BROKEN if $answer =~ /^(-1|b.*)$/i;
+ return PROMPT_RESPONSE_NO;
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>