REGRESSION(r117789): "webkit-patch rebaseline-expectations" copies contents in skia_t...
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Jun 2012 20:12:04 +0000 (20:12 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Jun 2012 20:12:04 +0000 (20:12 +0000)
commit26960d5da1297f4111e15a8b6cd5a99cd0208153
tree453591da52f43875400042b008dbf8cdb4764c1f
parentdec35af40626ea080066516612c519b266055638
REGRESSION(r117789): "webkit-patch rebaseline-expectations" copies contents in skia_test_expectations.txt into test_expectations.txt
https://bugs.webkit.org/show_bug.cgi?id=87406

Reviewed by Dirk Pranke.

* Scripts/webkitpy/layout_tests/models/test_expectations.py:
(TestExpectations.__init__):
* Scripts/webkitpy/tool/commands/rebaseline.py:
(RebaselineTest._update_expectations_file):
* Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
(test_rebaseline_does_not_include_overrides):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@119605 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
Tools/Scripts/webkitpy/tool/commands/rebaseline.py
Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py