Update skia docs to stop referring to NeedsManualRebaseline
No-Try: true
Docs-Preview: https://skia.org/?cl=179782
Bug: chromium:621126
Change-Id: Iee8d6d86a5cda31d84d4ebe708c7f6fd9f80f78b
Reviewed-on: https://skia-review.googlesource.com/c/179782
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
diff --git a/site/dev/chrome/blink.md b/site/dev/chrome/blink.md
index acfaef9..283e862 100644
--- a/site/dev/chrome/blink.md
+++ b/site/dev/chrome/blink.md
@@ -13,11 +13,12 @@
detail on running the Blink layout tests\).
2. Check in your code to the Skia repo.
3. Ahead of the Skia auto roll including your change, manually push a change to the
- Blink LayoutTests/TestExpectations [file](https://chromium.googlesource.com/chromium/src/+/master/third_party/WebKit/LayoutTests/TestExpectations),
- flagging tests expected to fail as a result of your change with \[ NeedsManualRebaseline \].
+ Blink LayoutTests/TestExpectations [file](https://chromium.googlesource.com/chromium/src/+/master/third_party/WebKit/LayoutTests/TestExpectations), flagging tests expected to fail as a result of your change as follows:
+ foo/bar/test-name.html [ Failure Pass ] # Needs rebaseline
+
4. Wait for the Skia roll to land successfully.
-5. Check in another change to the Blink TestExpectations file changing the flags to
- \[ NeedsRebaseline\], which will prompt the automatic rebaseline.
+5. Check in another change to the Blink TestExpectations file removing all the
+ skipped test expectations you add earlier, an run `git cl rebaseline` which will prompt the automatic rebaseline.
diff --git a/site/dev/sheriffing/index.md b/site/dev/sheriffing/index.md
index 3685d81..bdd1554 100644
--- a/site/dev/sheriffing/index.md
+++ b/site/dev/sheriffing/index.md
@@ -157,14 +157,14 @@
* (Preferred but slower) Make a separate Blink patch by editing LayoutTests/TestExpectations
* Add # comment about what has changed (I usually paraphrase the crbug text)
* Add line(s) like the following after the comment:
- * crbug.com/<bug#youjustcreated> foo/bar/test-name.html [ NeedsManualRebaseline ]
+ * crbug.com/<bug#youjustcreated> foo/bar/test-name.html [ Skip ] # needs rebaseline
* Commit the patch you created and wait until it lands and rolls into Chrome
* Retry the DEPS roll (for the 1st/dispreferred option this usually means just retrying the layout bots)
* Make a Blink patch by editing LayoutTests/TestExpectations
* Add # comment about what has changed
* Add line(s) like the following after the comment:
- * crbug.com/<bug#youjustcreated> foo/bar/test-name.html [ NeedsRebaseline ]
+ * crbug.com/<bug#youjustcreated> foo/bar/test-name.html [ Skip ] # needs rebaseline
* (if you took the second option above you can just edit the existing line(s))
* If you took the first/dispreferred option above:
