Update ARES-6.patch file accordingly for r233631.
authordewei_zhu@apple.com <dewei_zhu@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Jul 2018 21:59:37 +0000 (21:59 +0000)
committerdewei_zhu@apple.com <dewei_zhu@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Jul 2018 21:59:37 +0000 (21:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=187534

Reviewed by Saam Barati.

Update ARES-6.patch file acoordingly after ARES-6 plan file change to
avoid warning while applying the patch.

* Scripts/webkitpy/benchmark_runner/data/patches/webserver/ARES-6.patch:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@233700 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/benchmark_runner/data/patches/webserver/ARES-6.patch

index 2060f6f..113312f 100644 (file)
@@ -1,3 +1,15 @@
+2018-07-10  Dewei Zhu  <dewei_zhu@apple.com>
+
+        Update ARES-6.patch file accordingly for r233631.
+        https://bugs.webkit.org/show_bug.cgi?id=187534
+
+        Reviewed by Saam Barati.
+
+        Update ARES-6.patch file acoordingly after ARES-6 plan file change to
+        avoid warning while applying the patch.
+
+        * Scripts/webkitpy/benchmark_runner/data/patches/webserver/ARES-6.patch:
+
 2018-07-10  Tim Horton  <timothy_horton@apple.com>
 
         doAfterNextPresentationUpdate should not be called while content is hidden due to animated resize
index 4036658..d424347 100644 (file)
@@ -1,8 +1,8 @@
 diff --git a/driver.js b/driver.js
-index 26394093758..f6496f970ee 100644
+index 2ef7d63..bbbcc45 100644
 --- a/driver.js
 +++ b/driver.js
-@@ -136,6 +136,32 @@ class Driver {
+@@ -141,6 +141,32 @@ class Driver {
          this._benchmark = this._iterator ? this._iterator.next().value : null;
          if (!this._benchmark) {
              if (!this._numIterations) {
@@ -33,10 +33,10 @@ index 26394093758..f6496f970ee 100644
 +                xhr.send(content);
 +
                  if (isInBrowser) {
-                     this._statusCell.innerHTML =
-                         (this._hadErrors ? "Failures encountered!" : "Restart");
+                     this._statusCell.innerHTML = "Restart";
+                     this.readyTrigger();
 diff --git a/index.html b/index.html
-index 230657bac24..fb740f7f06d 100644
+index f676bb3..524220f 100644
 --- a/index.html
 +++ b/index.html
 @@ -11,6 +11,8 @@