| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 # Note that here the checksums don't match but the images do, so this test p
asses "unexpectedly". | 199 # Note that here the checksums don't match but the images do, so this test p
asses "unexpectedly". |
| 200 # See https://bugs.webkit.org/show_bug.cgi?id=69444 . | 200 # See https://bugs.webkit.org/show_bug.cgi?id=69444 . |
| 201 tests.add('failures/unexpected/checksum.html', actual_checksum='checksum_fai
l-checksum') | 201 tests.add('failures/unexpected/checksum.html', actual_checksum='checksum_fai
l-checksum') |
| 202 | 202 |
| 203 # Text output files contain "\r\n" on Windows. This may be | 203 # Text output files contain "\r\n" on Windows. This may be |
| 204 # helpfully filtered to "\r\r\n" by our Python/Cygwin tooling. | 204 # helpfully filtered to "\r\r\n" by our Python/Cygwin tooling. |
| 205 tests.add('passes/text.html', | 205 tests.add('passes/text.html', |
| 206 expected_text='\nfoo\n\n', actual_text='\nfoo\r\n\r\r\n') | 206 expected_text='\nfoo\n\n', actual_text='\nfoo\r\n\r\r\n') |
| 207 | 207 |
| 208 # For reftests. | 208 # For reftests. |
| 209 tests.add_reftest('passes/reftest.html', 'passes/reftest-expected.html', sam
e_image=True) | 209 tests.add_reftest('passes/reftest.html', 'passes/reftest-expected.sky', same
_image=True) |
| 210 | 210 |
| 211 # This adds a different virtual reference to ensure that that also works. | 211 # This adds a different virtual reference to ensure that that also works. |
| 212 tests.add('virtual/passes/reftest-expected.html', actual_checksum='xxx', act
ual_image='XXX', is_reftest=True) | 212 tests.add('virtual/passes/reftest-expected.sky', actual_checksum='xxx', actu
al_image='XXX', is_reftest=True) |
| 213 | 213 |
| 214 tests.add_reftest('passes/mismatch.html', 'passes/mismatch-expected-mismatch
.html', same_image=False) | 214 tests.add_reftest('passes/mismatch.html', 'passes/mismatch-expected-mismatch
.sky', same_image=False) |
| 215 tests.add_reftest('passes/svgreftest.svg', 'passes/svgreftest-expected.svg',
same_image=True) | 215 tests.add_reftest('passes/svgreftest.svg', 'passes/svgreftest-expected.svg',
same_image=True) |
| 216 tests.add_reftest('passes/xhtreftest.xht', 'passes/xhtreftest-expected.html'
, same_image=True) | 216 tests.add_reftest('passes/xhtreftest.xht', 'passes/xhtreftest-expected.sky',
same_image=True) |
| 217 tests.add_reftest('passes/phpreftest.php', 'passes/phpreftest-expected-misma
tch.svg', same_image=False) | 217 tests.add_reftest('passes/phpreftest.php', 'passes/phpreftest-expected-misma
tch.svg', same_image=False) |
| 218 tests.add_reftest('failures/expected/reftest.html', 'failures/expected/refte
st-expected.html', same_image=False) | 218 tests.add_reftest('failures/expected/reftest.html', 'failures/expected/refte
st-expected.sky', same_image=False) |
| 219 tests.add_reftest('failures/expected/mismatch.html', 'failures/expected/mism
atch-expected-mismatch.html', same_image=True) | 219 tests.add_reftest('failures/expected/mismatch.html', 'failures/expected/mism
atch-expected-mismatch.sky', same_image=True) |
| 220 tests.add_reftest('failures/unexpected/crash-reftest.html', 'failures/unexpe
cted/crash-reftest-expected.html', same_image=True, crash=True) | 220 tests.add_reftest('failures/unexpected/crash-reftest.html', 'failures/unexpe
cted/crash-reftest-expected.sky', same_image=True, crash=True) |
| 221 tests.add_reftest('failures/unexpected/reftest.html', 'failures/unexpected/r
eftest-expected.html', same_image=False) | 221 tests.add_reftest('failures/unexpected/reftest.html', 'failures/unexpected/r
eftest-expected.sky', same_image=False) |
| 222 tests.add_reftest('failures/unexpected/mismatch.html', 'failures/unexpected/
mismatch-expected-mismatch.html', same_image=True) | 222 tests.add_reftest('failures/unexpected/mismatch.html', 'failures/unexpected/
mismatch-expected-mismatch.sky', same_image=True) |
| 223 tests.add('failures/unexpected/reftest-nopixel.html', actual_checksum=None,
actual_image=None, is_reftest=True) | 223 tests.add('failures/unexpected/reftest-nopixel.html', actual_checksum=None,
actual_image=None, is_reftest=True) |
| 224 tests.add('failures/unexpected/reftest-nopixel-expected.html', actual_checks
um=None, actual_image=None, is_reftest=True) | 224 tests.add('failures/unexpected/reftest-nopixel-expected.sky', actual_checksu
m=None, actual_image=None, is_reftest=True) |
| 225 tests.add('reftests/foo/test.html') | 225 tests.add('reftests/foo/test.html') |
| 226 tests.add('reftests/foo/test-ref.html') | 226 tests.add('reftests/foo/test-ref.html') |
| 227 | 227 |
| 228 tests.add('reftests/foo/multiple-match-success.html', actual_checksum='abc',
actual_image='abc') | 228 tests.add('reftests/foo/multiple-match-success.html', actual_checksum='abc',
actual_image='abc') |
| 229 tests.add('reftests/foo/multiple-match-failure.html', actual_checksum='abc',
actual_image='abc') | 229 tests.add('reftests/foo/multiple-match-failure.html', actual_checksum='abc',
actual_image='abc') |
| 230 tests.add('reftests/foo/multiple-mismatch-success.html', actual_checksum='ab
c', actual_image='abc') | 230 tests.add('reftests/foo/multiple-mismatch-success.html', actual_checksum='ab
c', actual_image='abc') |
| 231 tests.add('reftests/foo/multiple-mismatch-failure.html', actual_checksum='ab
c', actual_image='abc') | 231 tests.add('reftests/foo/multiple-mismatch-failure.html', actual_checksum='ab
c', actual_image='abc') |
| 232 tests.add('reftests/foo/multiple-both-success.html', actual_checksum='abc',
actual_image='abc') | 232 tests.add('reftests/foo/multiple-both-success.html', actual_checksum='abc',
actual_image='abc') |
| 233 tests.add('reftests/foo/multiple-both-failure.html', actual_checksum='abc',
actual_image='abc') | 233 tests.add('reftests/foo/multiple-both-failure.html', actual_checksum='abc',
actual_image='abc') |
| 234 | 234 |
| 235 tests.add('reftests/foo/matching-ref.html', actual_checksum='abc', actual_im
age='abc') | 235 tests.add('reftests/foo/matching-ref.html', actual_checksum='abc', actual_im
age='abc') |
| 236 tests.add('reftests/foo/mismatching-ref.html', actual_checksum='def', actual
_image='def') | 236 tests.add('reftests/foo/mismatching-ref.html', actual_checksum='def', actual
_image='def') |
| 237 tests.add('reftests/foo/second-mismatching-ref.html', actual_checksum='ghi',
actual_image='ghi') | 237 tests.add('reftests/foo/second-mismatching-ref.html', actual_checksum='ghi',
actual_image='ghi') |
| 238 | 238 |
| 239 # The following files shouldn't be treated as reftests | 239 # The following files shouldn't be treated as reftests |
| 240 tests.add_reftest('reftests/foo/unlistedtest.html', 'reftests/foo/unlistedte
st-expected.html', same_image=True) | 240 tests.add_reftest('reftests/foo/unlistedtest.html', 'reftests/foo/unlistedte
st-expected.sky', same_image=True) |
| 241 tests.add('reftests/foo/reference/bar/common.html') | 241 tests.add('reftests/foo/reference/bar/common.html') |
| 242 tests.add('reftests/foo/reftest/bar/shared.html') | 242 tests.add('reftests/foo/reftest/bar/shared.html') |
| 243 | 243 |
| 244 tests.add('websocket/tests/passes/text.html') | 244 tests.add('websocket/tests/passes/text.html') |
| 245 | 245 |
| 246 # For testing that we don't run tests under platform/. Note that these don't
contribute to TOTAL_TESTS. | 246 # For testing that we don't run tests under platform/. Note that these don't
contribute to TOTAL_TESTS. |
| 247 tests.add('platform/test-mac-leopard/http/test.html') | 247 tests.add('platform/test-mac-leopard/http/test.html') |
| 248 tests.add('platform/test-win-win7/http/test.html') | 248 tests.add('platform/test-win-win7/http/test.html') |
| 249 | 249 |
| 250 # For testing if perf tests are running in a locked shard. | 250 # For testing if perf tests are running in a locked shard. |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 else: | 637 else: |
| 638 image = test.actual_image | 638 image = test.actual_image |
| 639 return DriverOutput(actual_text, image, test.actual_checksum, audio, | 639 return DriverOutput(actual_text, image, test.actual_checksum, audio, |
| 640 crash=(crash or web_process_crash), crashed_process_name=crashed_pro
cess_name, | 640 crash=(crash or web_process_crash), crashed_process_name=crashed_pro
cess_name, |
| 641 crashed_pid=crashed_pid, crash_log=crash_log, | 641 crashed_pid=crashed_pid, crash_log=crash_log, |
| 642 test_time=time.time() - start_time, timeout=test.timeout, error=test
.error, pid=self.pid, | 642 test_time=time.time() - start_time, timeout=test.timeout, error=test
.error, pid=self.pid, |
| 643 leak=test.leak) | 643 leak=test.leak) |
| 644 | 644 |
| 645 def stop(self): | 645 def stop(self): |
| 646 self.started = False | 646 self.started = False |
| OLD | NEW |