| Index: buildbot/scripts/master/factory_commands.py
|
| ===================================================================
|
| --- buildbot/scripts/master/factory_commands.py (revision 12810)
|
| +++ buildbot/scripts/master/factory_commands.py (working copy)
|
| @@ -120,7 +120,35 @@
|
| }
|
| }
|
|
|
| + # Configuration of SunSpider tests.
|
| + SUNSPIDER_TEST_MAPPINGS = {
|
| + 'Release': {
|
| + 'chromium-rel-xp': 'xp-release/sunspider',
|
| + 'chromium-rel-jsc': 'xp-release-jsc/sunspider',
|
| + 'chromium-rel-xp-dual': 'xp-release-dual-core/sunspider',
|
| + 'chromium-rel-xp-single': 'xp-release-single-core/sunspider',
|
| + 'chromium-rel-vista-dual': 'vista-release-dual-core/sunspider',
|
| + 'chromium-rel-vista-single': 'vista-release-single-core/sunspider',
|
| + 'chromium-rel-xp-dual-v8': 'xp-release-v8-latest/sunspider',
|
| + 'chromium-rel-mac': 'mac-release/sunspider',
|
| + }
|
| + }
|
|
|
| + # Configuration of V8 Benchmark tests.
|
| + V8_BENCHMARK_TEST_MAPPINGS = {
|
| + 'Release': {
|
| + 'chromium-rel-xp': 'xp-release/v8_benchmark',
|
| + 'chromium-rel-jsc': 'xp-release-jsc/v8_benchmark',
|
| + 'chromium-rel-xp-dual': 'xp-release-dual-core/v8_benchmark',
|
| + 'chromium-rel-xp-single': 'xp-release-single-core/v8_benchmark',
|
| + 'chromium-rel-vista-dual': 'vista-release-dual-core/v8_benchmark',
|
| + 'chromium-rel-vista-single': 'vista-release-single-core/v8_benchmark',
|
| + 'chromium-rel-xp-dual-v8': 'xp-release-v8-latest/v8_benchmark',
|
| + 'chromium-rel-mac': 'mac-release/v8_benchmark',
|
| + }
|
| + }
|
| +
|
| +
|
| def __init__(self, factory=None, identifier=None, target=None,
|
| build_dir=None, target_platform=None):
|
| """Initializes the SlaveCommands class.
|
| @@ -178,11 +206,11 @@
|
| # Valgrind isn't in the script_dir, it's out on its own.
|
| self._valgrind_tool = self.PathJoin('src', 'tools', 'valgrind',
|
| 'chrome_tests.sh')
|
| -
|
| +
|
| # Gears test runner lives in the gears src tree.
|
| self._gears_test_runner = self.PathJoin('src', 'gears', 'gears',
|
| 'test', 'runner', 'bootstrap.py')
|
| -
|
| +
|
| # Gears working dir.
|
| self._gears_root = self.PathJoin('build', 'src', 'gears', 'gears')
|
|
|
| @@ -235,7 +263,7 @@
|
| arg_list=None):
|
| """Returns a command list to call the _test_tool on the given executable,
|
| passing the arg_list, if any, to that executable under test.
|
| -
|
| +
|
| Automatically fix the executable name on Windows by adding '.exe'.
|
| """
|
| cmd = [self._python, self._test_tool,
|
| @@ -590,6 +618,20 @@
|
| self.TAB_SWITCHING_TEST_MAPPINGS,
|
| process_log.GraphingLogProcessor)
|
|
|
| + def GetSunSpiderTestCommand(self, perf_id, show_results, **kwargs):
|
| + """Selects the right build step for the specified SunSpider test.
|
| + """
|
| + return self.GetPerfTestCommand(perf_id, show_results,
|
| + self.SUNSPIDER_TEST_MAPPINGS,
|
| + process_log.GraphingLogProcessor)
|
| +
|
| + def GetV8BenchmarkTestCommand(self, perf_id, show_results, **kwargs):
|
| + """Selects the right build step for the specified V8 Benchmark test.
|
| + """
|
| + return self.GetPerfTestCommand(perf_id, show_results,
|
| + self.V8_BENCHMARK_TEST_MAPPINGS,
|
| + process_log.GraphingLogProcessor)
|
| +
|
| def GetPageCyclerCommand(self, test_name, http):
|
| """Returns a command list to call the _test_tool on the page_cycler
|
| executable, with the appropriate GTest filter and additional arguments.
|
| @@ -605,7 +647,7 @@
|
| cmd.extend([self.GetExecutableName('page_cycler_tests'),
|
| '--gtest_filter=PageCycler*.%s%s' % (test_name, test_type)])
|
| return cmd
|
| -
|
| +
|
| def GetDomCheckerTestCommand(self):
|
| """Returns a command list to call the _test_tool for the DOM checker tests.
|
|
|
| @@ -742,6 +784,28 @@
|
| test_command=self.GetTestCommand('tab_switching_test',
|
| arg_list=options))
|
|
|
| + def AddSunSpiderTests(self, show_results, perf_id=None, timeout=300):
|
| + """Adds a step to the factory to run the SunSpider test."""
|
| + c = self.GetSunSpiderTestCommand(perf_id, show_results)
|
| + options = ['--gtest_filter=SunSpider*.*', '--gtest_print_time',
|
| + '--run-sunspider']
|
| + self.AddTestStep(command_class=c,
|
| + timeout=timeout,
|
| + test_name='sunspider_test',
|
| + test_command=self.GetTestCommand('sunspider_test',
|
| + arg_list=options))
|
| +
|
| + def AddV8BenchmarkTests(self, show_results, perf_id=None, timeout=300):
|
| + """Adds a step to the factory to run the SunSpider test."""
|
| + c = self.GetV8BenchmarkTestCommand(perf_id, show_results)
|
| + options = ['--gtest_filter=V8Benchmark*.*', '--gtest_print_time',
|
| + '--run-v8-benchmark']
|
| + self.AddTestStep(command_class=c,
|
| + timeout=timeout,
|
| + test_name='v8_benchmark_test',
|
| + test_command=self.GetTestCommand('v8_benchmark_test',
|
| + arg_list=options))
|
| +
|
| #######
|
| # Chrome tests
|
|
|
| @@ -1068,7 +1132,7 @@
|
| def AddTestShellTests(self):
|
| """Adds a step to the factory to run the test_shell_tests."""
|
| self.AddBasicGTestTestStep('test_shell_tests')
|
| -
|
| +
|
| def AddGearsMake(self, mode, clean=True):
|
| """Adds a step to the factory to build gears using make."""
|
| # Making gears from the open source repo requires a lot of setup,
|
|
|