Changeset 115352 in webkit
- Timestamp:
- Apr 26, 2012 1:47:23 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 130 added
- 10 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r115349 r115352 1 2012-04-26 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Unreviewed, rolling out r115340. 4 http://trac.webkit.org/changeset/115340 5 https://bugs.webkit.org/show_bug.cgi?id=83048 6 7 Does not work with Windows. 8 9 * css2.1/20110323/abspos-containing-block-initial-004-ref-expected.png: Added. 10 * css2.1/20110323/abspos-containing-block-initial-004-ref-expected.txt: Added. 11 * css2.1/20110323/abspos-containing-block-initial-004a-expected.png: Added. 12 * css2.1/20110323/abspos-containing-block-initial-004a-expected.txt: Added. 13 * css2.1/20110323/abspos-containing-block-initial-004b-expected.png: Added. 14 * css2.1/20110323/abspos-containing-block-initial-004b-expected.txt: Added. 15 * css2.1/20110323/abspos-containing-block-initial-004c-expected.png: Added. 16 * css2.1/20110323/abspos-containing-block-initial-004c-expected.txt: Added. 17 * css2.1/20110323/abspos-containing-block-initial-004d-expected.png: Added. 18 * css2.1/20110323/abspos-containing-block-initial-004d-expected.txt: Added. 19 * css2.1/20110323/abspos-containing-block-initial-004e-expected.png: Added. 20 * css2.1/20110323/abspos-containing-block-initial-004e-expected.txt: Added. 21 * css2.1/20110323/abspos-containing-block-initial-004f-expected.png: Added. 22 * css2.1/20110323/abspos-containing-block-initial-004f-expected.txt: Added. 23 * css2.1/20110323/abspos-containing-block-initial-005-ref-expected.png: Added. 24 * css2.1/20110323/abspos-containing-block-initial-005-ref-expected.txt: Added. 25 * css2.1/20110323/abspos-containing-block-initial-005a-expected.png: Added. 26 * css2.1/20110323/abspos-containing-block-initial-005a-expected.txt: Added. 27 * css2.1/20110323/abspos-containing-block-initial-005b-expected.png: Added. 28 * css2.1/20110323/abspos-containing-block-initial-005b-expected.txt: Added. 29 * css2.1/20110323/abspos-containing-block-initial-005c-expected.png: Added. 30 * css2.1/20110323/abspos-containing-block-initial-005c-expected.txt: Added. 31 * css2.1/20110323/abspos-containing-block-initial-005d-expected.png: Added. 32 * css2.1/20110323/abspos-containing-block-initial-005d-expected.txt: Added. 33 * css2.1/20110323/abspos-containing-block-initial-007-expected.txt: Added. 34 * css2.1/20110323/abspos-containing-block-initial-007-ref-expected.txt: Added. 35 * css2.1/20110323/abspos-containing-block-initial-009-ref-expected.png: Added. 36 * css2.1/20110323/abspos-containing-block-initial-009-ref-expected.txt: Added. 37 * css2.1/20110323/abspos-containing-block-initial-009a-expected.png: Added. 38 * css2.1/20110323/abspos-containing-block-initial-009a-expected.txt: Added. 39 * css2.1/20110323/abspos-containing-block-initial-009b-expected.png: Added. 40 * css2.1/20110323/abspos-containing-block-initial-009b-expected.txt: Added. 41 * css2.1/20110323/abspos-containing-block-initial-009e-expected.png: Added. 42 * css2.1/20110323/abspos-containing-block-initial-009e-expected.txt: Added. 43 * css2.1/20110323/abspos-containing-block-initial-009f-expected.png: Added. 44 * css2.1/20110323/abspos-containing-block-initial-009f-expected.txt: Added. 45 * css2.1/20110323/abspos-non-replaced-width-margin-000-expected.txt: Added. 46 * css2.1/20110323/abspos-replaced-width-margin-000-expected.txt: Added. 47 * css2.1/20110323/background-016.htm: Removed. 48 * css2.1/20110323/block-replaced-width-001.htm: Added. 49 * css2.1/20110323/empty-inline-001.htm: 50 * css2.1/20110323/reftest.list: Removed. 51 * css2.1/reference/ref-filled-green-100px-square.htm: Removed. 52 * css2.1/reference/ref-filled-green-100px-square.xht: Removed. 53 * css2.1/reference/ref-if-there-is-no-red.htm: Removed. 54 * css2.1/reference/ref-if-there-is-no-red.xht: Removed. 55 * css2.1/reference/ref-nothing-below.htm: Removed. 56 * css2.1/reference/ref-nothing-below.xht: Removed. 57 * css2.1/reference/ref-this-text-should-be-green.htm: Removed. 58 * css2.1/reference/ref-this-text-should-be-green.xht: Removed. 59 * platform/chromium-linux/css2.1/20110323/abspos-containing-block-initial-001-expected.png: Added. 60 * platform/chromium-linux/css2.1/20110323/abspos-containing-block-initial-001-ref-expected.png: Added. 61 * platform/chromium-linux/css2.1/20110323/abspos-containing-block-initial-007-expected.png: Added. 62 * platform/chromium-linux/css2.1/20110323/abspos-containing-block-initial-007-ref-expected.png: Added. 63 * platform/chromium-linux/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png: Added. 64 * platform/chromium-linux/css2.1/20110323/abspos-non-replaced-width-margin-000-ref-expected.png: Added. 65 * platform/chromium-linux/css2.1/20110323/abspos-replaced-width-margin-000-expected.png: Added. 66 * platform/chromium-linux/css2.1/20110323/abspos-replaced-width-margin-000-ref-expected.png: Added. 67 * platform/chromium-linux/css2.1/20110323/empty-inline-001-expected.png: Added. 68 * platform/chromium-mac-leopard/css2.1/20110323/block-replaced-width-001-expected.png: Added. 69 * platform/chromium-mac-leopard/css2.1/20110323/empty-inline-001-expected.png: Added. 70 * platform/chromium-mac-snowleopard/css2.1/20110323/abspos-containing-block-initial-001-expected.png: Added. 71 * platform/chromium-mac-snowleopard/css2.1/20110323/abspos-containing-block-initial-007-expected.png: Added. 72 * platform/chromium-mac-snowleopard/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png: Added. 73 * platform/chromium-mac-snowleopard/css2.1/20110323/abspos-replaced-width-margin-000-expected.png: Added. 74 * platform/chromium-mac-snowleopard/css2.1/20110323/block-replaced-width-001-expected.png: Added. 75 * platform/chromium-mac-snowleopard/css2.1/20110323/empty-inline-001-expected.png: Added. 76 * platform/chromium-mac/css2.1/20110323/abspos-containing-block-initial-001-expected.png: Added. 77 * platform/chromium-mac/css2.1/20110323/abspos-containing-block-initial-007-expected.png: Added. 78 * platform/chromium-mac/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png: Added. 79 * platform/chromium-mac/css2.1/20110323/abspos-replaced-width-margin-000-expected.png: Added. 80 * platform/chromium-mac/css2.1/20110323/block-replaced-width-001-expected.png: Added. 81 * platform/chromium-mac/css2.1/20110323/empty-inline-001-expected.png: Added. 82 * platform/chromium-win/css2.1/20110323/abspos-containing-block-initial-001-expected.png: Added. 83 * platform/chromium-win/css2.1/20110323/abspos-containing-block-initial-001-ref-expected.png: Added. 84 * platform/chromium-win/css2.1/20110323/abspos-containing-block-initial-007-expected.png: Added. 85 * platform/chromium-win/css2.1/20110323/abspos-containing-block-initial-007-ref-expected.png: Added. 86 * platform/chromium-win/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png: Added. 87 * platform/chromium-win/css2.1/20110323/abspos-non-replaced-width-margin-000-ref-expected.png: Added. 88 * platform/chromium-win/css2.1/20110323/abspos-replaced-width-margin-000-expected.png: Added. 89 * platform/chromium-win/css2.1/20110323/abspos-replaced-width-margin-000-ref-expected.png: Added. 90 * platform/chromium-win/css2.1/20110323/empty-inline-001-expected.png: Added. 91 * platform/chromium-win/css2.1/20110323/empty-inline-001-expected.txt: Added. 92 * platform/chromium/css2.1/20110323/abspos-containing-block-initial-001-ref-expected.png: Added. 93 * platform/chromium/css2.1/20110323/abspos-containing-block-initial-007-ref-expected.png: Added. 94 * platform/efl/css2.1/20110323/abspos-containing-block-initial-007-expected.png: Added. 95 * platform/efl/css2.1/20110323/abspos-containing-block-initial-007-expected.txt: Added. 96 * platform/efl/css2.1/20110323/abspos-containing-block-initial-007-ref-expected.png: Added. 97 * platform/efl/css2.1/20110323/abspos-containing-block-initial-007-ref-expected.txt: Added. 98 * platform/efl/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png: Added. 99 * platform/efl/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.txt: Added. 100 * platform/efl/css2.1/20110323/abspos-non-replaced-width-margin-000-ref-expected.png: Added. 101 * platform/efl/css2.1/20110323/abspos-non-replaced-width-margin-000-ref-expected.txt: Added. 102 * platform/efl/css2.1/20110323/abspos-replaced-width-margin-000-expected.png: Added. 103 * platform/efl/css2.1/20110323/abspos-replaced-width-margin-000-expected.txt: Added. 104 * platform/efl/css2.1/20110323/abspos-replaced-width-margin-000-ref-expected.png: Added. 105 * platform/efl/css2.1/20110323/abspos-replaced-width-margin-000-ref-expected.txt: Added. 106 * platform/efl/css2.1/20110323/block-replaced-width-001-expected.png: Added. 107 * platform/efl/css2.1/20110323/block-replaced-width-001-expected.txt: Added. 108 * platform/gtk/css2.1/20110323/abspos-containing-block-initial-001-expected.txt: Added. 109 * platform/gtk/css2.1/20110323/abspos-containing-block-initial-001-ref-expected.txt: Added. 110 * platform/gtk/css2.1/20110323/abspos-containing-block-initial-007-expected.txt: Added. 111 * platform/gtk/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png: Added. 112 * platform/gtk/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.txt: Added. 113 * platform/gtk/css2.1/20110323/abspos-non-replaced-width-margin-000-ref-expected.png: Added. 114 * platform/gtk/css2.1/20110323/abspos-non-replaced-width-margin-000-ref-expected.txt: Added. 115 * platform/gtk/css2.1/20110323/abspos-replaced-width-margin-000-expected.png: Added. 116 * platform/gtk/css2.1/20110323/abspos-replaced-width-margin-000-expected.txt: Added. 117 * platform/gtk/css2.1/20110323/abspos-replaced-width-margin-000-ref-expected.png: Added. 118 * platform/gtk/css2.1/20110323/abspos-replaced-width-margin-000-ref-expected.txt: Added. 119 * platform/gtk/css2.1/20110323/block-replaced-width-001-expected.png: Added. 120 * platform/mac-snowleopard/css2.1/20110323/abspos-containing-block-initial-001-expected.png: Added. 121 * platform/mac-snowleopard/css2.1/20110323/abspos-containing-block-initial-007-expected.png: Added. 122 * platform/mac-snowleopard/css2.1/20110323/abspos-replaced-width-margin-000-expected.png: Added. 123 * platform/mac/css2.1/20110323/abspos-containing-block-initial-001-expected.txt: Added. 124 * platform/mac/css2.1/20110323/abspos-containing-block-initial-001-ref-expected.txt: Added. 125 * platform/mac/css2.1/20110323/abspos-containing-block-initial-007-expected.txt: Added. 126 * platform/mac/css2.1/20110323/abspos-containing-block-initial-007-ref-expected.txt: Added. 127 * platform/mac/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png: Added. 128 * platform/mac/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.txt: Added. 129 * platform/mac/css2.1/20110323/abspos-non-replaced-width-margin-000-ref-expected.png: Added. 130 * platform/mac/css2.1/20110323/abspos-non-replaced-width-margin-000-ref-expected.txt: Added. 131 * platform/mac/css2.1/20110323/abspos-replaced-width-margin-000-expected.png: Added. 132 * platform/mac/css2.1/20110323/abspos-replaced-width-margin-000-expected.txt: Added. 133 * platform/mac/css2.1/20110323/abspos-replaced-width-margin-000-ref-expected.png: Added. 134 * platform/mac/css2.1/20110323/abspos-replaced-width-margin-000-ref-expected.txt: Added. 135 * platform/mac/css2.1/20110323/block-replaced-width-001-expected.png: Added. 136 * platform/mac/css2.1/20110323/block-replaced-width-001-expected.txt: Added. 137 * platform/mac/css2.1/20110323/empty-inline-001-expected.png: Added. 138 * platform/mac/css2.1/20110323/empty-inline-001-expected.txt: Added. 139 * platform/qt/css2.1/20110323/abspos-containing-block-initial-001-expected.txt: Added. 140 * platform/qt/css2.1/20110323/abspos-containing-block-initial-001-ref-expected.txt: Added. 141 * platform/qt/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png: Added. 142 * platform/qt/css2.1/20110323/abspos-non-replaced-width-margin-000-ref-expected.png: Added. 143 * platform/qt/css2.1/20110323/abspos-non-replaced-width-margin-000-ref-expected.txt: Added. 144 * platform/qt/css2.1/20110323/abspos-replaced-width-margin-000-expected.png: Added. 145 * platform/qt/css2.1/20110323/abspos-replaced-width-margin-000-ref-expected.png: Added. 146 * platform/qt/css2.1/20110323/abspos-replaced-width-margin-000-ref-expected.txt: Added. 147 * platform/qt/css2.1/20110323/block-replaced-width-001-expected.png: Added. 148 * platform/qt/css2.1/20110323/block-replaced-width-001-expected.txt: Added. 149 * platform/qt/css2.1/20110323/empty-inline-001-expected.txt: Added. 150 1 151 2012-04-26 Dimitri Glazkov <dglazkov@chromium.org> 2 152 -
trunk/LayoutTests/css2.1/20110323/empty-inline-001.htm
r115340 r115352 5 5 <link rel="author" title="Microsoft" href="http://www.microsoft.com/"> 6 6 <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#inline-formatting"> 7 <link rel="match" href="../reference/ref-if-there-is-no-red.htm">8 9 7 <meta name="flags" content=""> 10 8 <meta name="assert" content="Empty inline elements create a zero-height line box."> … … 21 19 </head> 22 20 <body> 23 <p>Test passes if there is <strong>no red</strong>.</p>21 <p>Test passes if there is no red on this page.</p> 24 22 <div> 25 23 <span></span> -
trunk/Tools/ChangeLog
r115341 r115352 1 2012-04-26 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Unreviewed, rolling out r115340. 4 http://trac.webkit.org/changeset/115340 5 https://bugs.webkit.org/show_bug.cgi?id=83048 6 7 Does not work with Windows. 8 9 * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py: 10 (SingleTestRunner._run_reftest): 11 * Scripts/webkitpy/layout_tests/controllers/test_result_writer.py: 12 (copy_file): 13 * Scripts/webkitpy/layout_tests/port/base.py: 14 (Port._parse_reftest_list): 15 (Port.reference_files): 16 (Port._real_tests): 17 * Scripts/webkitpy/layout_tests/port/base_unittest.py: 18 (PortTest.test_reference_files): 19 * Scripts/webkitpy/layout_tests/port/chromium_unittest.py: 20 (ChromiumDriverTest.test_write_command_and_read_line): 21 1 22 2012-04-26 Christophe Dumez <christophe.dumez@intel.com> 2 23 -
trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
r115340 r115352 288 288 putAllMismatchBeforeMatch = sorted 289 289 for expectation, reference_filename in putAllMismatchBeforeMatch(self._reference_files): 290 assert(self._filesystem.exists(reference_filename))291 290 reference_test_name = self._port.relative_test_filename(reference_filename) 292 291 reference_output = self._driver.run_test(DriverInput(reference_test_name, self._timeout, test_output.image_hash, should_run_pixel_test=True)) -
trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py
r115340 r115352 266 266 dst_filepath = fs.join(self._root_output_dir, self._port.relative_test_filename(src_filepath)) 267 267 self._make_output_directory() 268 fs.maybe_make_directory(fs.dirname(dst_filepath))269 268 fs.copyfile(src_filepath, dst_filepath) -
trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py
r115340 r115352 472 472 return parsed_list 473 473 474 def available_reference_files(self, reftest_list, test_name):475 reference_files = []476 for expectation, ref_test in reftest_list.get(self.abspath_for_test(test_name), []):477 ref_test = self._filesystem.abspath(ref_test)478 if self._filesystem.exists(ref_test):479 reference_files.append((expectation, ref_test))480 return reference_files481 482 474 def reference_files(self, test_name): 483 475 """Return a list of expectation (== or !=) and filename pairs""" 484 476 485 477 reftest_list = self._get_reftest_list(test_name) 486 reference_files = [] 487 if reftest_list: 488 reference_files = self.available_reference_files(reftest_list, test_name) 489 490 for expectation, prefix in (('==', ''), ('!=', '-mismatch')): 491 for extention in Port._supported_file_extensions: 492 path = self.expected_filename(test_name, prefix + extention) 493 if self._filesystem.exists(path): 494 reference_files.append((expectation, path)) 495 return reference_files 496 478 if not reftest_list: 479 reftest_list = [] 480 for expectation, prefix in (('==', ''), ('!=', '-mismatch')): 481 for extention in Port._supported_file_extensions: 482 path = self.expected_filename(test_name, prefix + extention) 483 if self._filesystem.exists(path): 484 reftest_list.append((expectation, path)) 485 return reftest_list 486 487 return reftest_list.get(self._filesystem.join(self.layout_tests_dir(), test_name), []) 497 488 498 489 def tests(self, paths): … … 502 493 def _real_tests(self, paths): 503 494 # When collecting test cases, skip these directories 504 skipped_directories = set(['.svn', '_svn', 'resources', 'script-tests', 'reference', 'reftest' , 'support'])495 skipped_directories = set(['.svn', '_svn', 'resources', 'script-tests', 'reference', 'reftest']) 505 496 files = find_files.find(self._filesystem, self.layout_tests_dir(), paths, skipped_directories, Port._is_test_file) 506 497 return set([self.relative_test_filename(f) for f in files]) -
trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
r115340 r115352 353 353 self.assertEqual(port.reference_files('passes/phpreftest.php'), [('!=', port.layout_tests_dir() + '/passes/phpreftest-expected-mismatch.svg')]) 354 354 355 def test_reference_files_when_reftestlist_and_reference_file_present(self):356 port = self.make_port(with_tests=True)357 port.host.filesystem.write_text_file(port.layout_tests_dir() + '/passes/test-4-expected.html', '')358 port.host.filesystem.files['passes/reftest.list'] = "\n".join(["== test.html test-ref.html",359 "",360 "# some comment",361 "!= test-2.html test-notref.html # more comments",362 "== test-3.html test-ref.html",363 "== test-3.html test-ref2.html",364 "!= test-3.html test-notref.html"])365 self.assertEqual(port.reference_files('passes/test-4.html'), [('==', port.layout_tests_dir() + '/passes/test-4-expected.html')])366 367 355 def test_operating_system(self): 368 356 self.assertEqual('mac', self.make_port().operating_system()) -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
r115340 r115352 93 93 self._assert_write_command_and_read_line(expected_crash=True) 94 94 95 def test_strip_uri(self):96 self.driver._proc = Mock()97 self.driver._proc.stdout = StringIO.StringIO("#URL:file:///some/test.html")98 self.driver.test_to_uri = lambda test: 'file:///some/other/../test.html'99 self.driver._port.driver_name = lambda: 'mockdriver'100 driver_output = self.driver.run_test(DriverInput(test_name='some/other/test.html', timeout=1, image_hash=None, is_reftest=False))101 102 95 def test_crash_log(self): 103 96 self.driver._proc = Mock()
Note: See TracChangeset
for help on using the changeset viewer.