| 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 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 from webkitpy.common import system | 33 from webkitpy.common import system |
| 34 from webkitpy.common.host import Host | 34 from webkitpy.common.host import Host |
| 35 from webkitpy.common.net.layouttestresults import for_each_test, JSONTestResult | 35 from webkitpy.common.net.layouttestresults import for_each_test, JSONTestResult |
| 36 from webkitpy.layout_tests.layout_package import json_results_generator | 36 from webkitpy.layout_tests.layout_package import json_results_generator |
| 37 from webkitpy.tool.commands.abstractlocalservercommand import AbstractLocalServe
rCommand | 37 from webkitpy.tool.commands.abstractlocalservercommand import AbstractLocalServe
rCommand |
| 38 from webkitpy.tool.servers.rebaselineserver import get_test_baselines, Rebaselin
eHTTPServer, STATE_NEEDS_REBASELINE | 38 from webkitpy.tool.servers.rebaselineserver import get_test_baselines, Rebaselin
eHTTPServer, STATE_NEEDS_REBASELINE |
| 39 | 39 |
| 40 | 40 |
| 41 class TestConfig(object): | 41 class TestConfig(object): |
| 42 |
| 42 def __init__(self, test_port, layout_tests_directory, results_directory, pla
tforms, host): | 43 def __init__(self, test_port, layout_tests_directory, results_directory, pla
tforms, host): |
| 43 self.test_port = test_port | 44 self.test_port = test_port |
| 44 self.layout_tests_directory = layout_tests_directory | 45 self.layout_tests_directory = layout_tests_directory |
| 45 self.results_directory = results_directory | 46 self.results_directory = results_directory |
| 46 self.platforms = platforms | 47 self.platforms = platforms |
| 47 self.host = host | 48 self.host = host |
| 48 self.filesystem = host.filesystem | 49 self.filesystem = host.filesystem |
| 49 self.scm = host.scm() | 50 self.scm = host.scm() |
| 50 | 51 |
| 51 | 52 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 self._gather_baselines(results_json) | 93 self._gather_baselines(results_json) |
| 93 | 94 |
| 94 return { | 95 return { |
| 95 'test_config': self._test_config, | 96 'test_config': self._test_config, |
| 96 "results_json": results_json, | 97 "results_json": results_json, |
| 97 "platforms_json": { | 98 "platforms_json": { |
| 98 'platforms': platforms, | 99 'platforms': platforms, |
| 99 'defaultPlatform': port.name(), | 100 'defaultPlatform': port.name(), |
| 100 }, | 101 }, |
| 101 } | 102 } |
| OLD | NEW |