Index: slave/skia_slave_scripts/flavor_utils/chrome_canary_build_step_utils.py |
diff --git a/slave/skia_slave_scripts/flavor_utils/chrome_canary_build_step_utils.py b/slave/skia_slave_scripts/flavor_utils/chrome_canary_build_step_utils.py |
deleted file mode 100644 |
index f0333b9364d738c10d17131a0f92cab3bc1736bd..0000000000000000000000000000000000000000 |
--- a/slave/skia_slave_scripts/flavor_utils/chrome_canary_build_step_utils.py |
+++ /dev/null |
@@ -1,74 +0,0 @@ |
-#!/usr/bin/env python |
-# Copyright (c) 2013 The Chromium Authors. All rights reserved. |
-# Use of this source code is governed by a BSD-style license that can be |
-# found in the LICENSE file. |
- |
-""" Utilities for Chrome canary build steps. """ |
- |
-from default_build_step_utils import DefaultBuildStepUtils |
-from common import chromium_utils |
-from utils import gclient_utils |
-from py.utils import misc |
-from py.utils import shell_utils |
- |
-import os |
- |
- |
-# Experiment to see if fastbuild is any faster for our Windows Chrome canary. |
-EXTRA_GYP_DEFINES = ' fastbuild=2 component=shared_library' |
- |
- |
-class ChromeCanaryBuildStepUtils(DefaultBuildStepUtils): |
- def __init__(self, build_step_instance): |
- DefaultBuildStepUtils.__init__(self, build_step_instance) |
- self._baseline_dir = os.path.join(os.pardir, 'webkit-master') |
- self._result_dir = os.path.join(os.pardir, 'layouttest_results') |
- |
- def RunFlavoredCmd(self, app, args): |
- """Run the executable.""" |
- # Run through runtest.py everywhere but Windows, where it doesn't work for |
- # some reason (see http://skbug.com/2520). |
- if os.name == 'nt': |
- cmd = [self._PathToBinary(app)] + args |
- else: |
- runtest = os.path.join(misc.BUILDBOT_PATH, 'third_party', |
- 'chromium_buildbot', 'scripts', 'slave', |
- 'runtest.py') |
- cmd = ['python', runtest, '--target', self._step.configuration, app, |
- '--xvfb', '--build-dir', 'out'] + args |
- shell_utils.run(cmd) |
- |
- def Compile(self, target): |
- if not os.path.isdir('out'): |
- self.RunGYP() |
- make_cmd = 'ninja' |
- cmd = [make_cmd, |
- '-C', os.path.join('out', self._step.configuration), |
- target, |
- ] |
- cmd.extend(self._step.make_flags) |
- shell_utils.run(cmd) |
- |
- def MakeClean(self): |
- if os.path.isdir('out'): |
- chromium_utils.RemoveDirectory('out') |
- |
- def RunGYP(self): |
- gclient_utils.RunHooks(gyp_defines=self.gyp_defines, |
- gyp_generators=self.gyp_generators) |
- |
- @property |
- def baseline_dir(self): |
- return self._baseline_dir |
- |
- @property |
- def result_dir(self): |
- return self._result_dir |
- |
- @property |
- def gyp_defines(self): |
- return self._step.args['gyp_defines'] + EXTRA_GYP_DEFINES |
- |
- @property |
- def gyp_generators(self): |
- return 'ninja' |