Chromium Code Reviews| Index: scripts/slave/recipe_modules/gpu/api.py |
| diff --git a/scripts/slave/recipe_modules/gpu/api.py b/scripts/slave/recipe_modules/gpu/api.py |
| index 981c17f9a40769f8cfc180daa01c264488718191..4b24c4ccb589fb65c9bed54f12ccbb2b7c12c55a 100644 |
| --- a/scripts/slave/recipe_modules/gpu/api.py |
| +++ b/scripts/slave/recipe_modules/gpu/api.py |
| @@ -7,7 +7,6 @@ from slave import recipe_api |
| SIMPLE_TESTS_TO_RUN = [ |
| 'content_gl_tests', |
| 'gles2_conform_test', |
| - 'gl_tests', |
| 'angle_unittests' |
| ] |
| @@ -60,6 +59,8 @@ class GpuApi(recipe_api.RecipeApi): |
| self.m.chromium.c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1 |
| + self.m.isolate.set_isolate_environment(self.m.chromium.c) |
| + |
| def checkout_steps(self): |
| # Always force a gclient-revert in order to avoid problems when |
| # directories are added to, removed from, and re-added to the repo. |
| @@ -122,7 +123,9 @@ class GpuApi(recipe_api.RecipeApi): |
| # Note: --no-xvfb is the default. |
| for test in SIMPLE_TESTS_TO_RUN: |
| - yield self.m.chromium.runtests(test, spawn_dbus=True) |
|
Ken Russell (switch to Gerrit)
2014/01/10 23:29:33
Note that the script now spawns dbus by default, s
|
| + yield self.m.chromium.runtests(test) |
| + |
| + yield self.m.isolate.run_isolate_test('gl_tests') |
| # Choose a reasonable default for the location of the sandbox binary |
| # on the bots. |