Index: build/android/buildbot/bb_device_steps.py |
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py |
index 52bbbf8ee3a76b5f5323b647b80577a7009c07db..19d2c2ce627e94db64df8df44565b0ecc842bec7 100755 |
--- a/build/android/buildbot/bb_device_steps.py |
+++ b/build/android/buildbot/bb_device_steps.py |
@@ -456,10 +456,10 @@ def RunWebRTCNativeTests(options): |
def RunGPUTests(options): |
- InstallApk(options, INSTRUMENTATION_TESTS['ContentShell'], False) |
- |
- bb_annotations.PrintNamedStep('gpu_tests') |
revision = _GetRevision(options) |
+ builder_name = options.build_properties.get('buildername', 'noname') |
+ |
+ bb_annotations.PrintNamedStep('pixel_tests') |
RunCmd(['content/test/gpu/run_gpu_test.py', |
'pixel', |
'--browser', |
@@ -472,14 +472,23 @@ def RunGPUTests(options): |
'--os-type', |
'android', |
'--test-machine-name', |
- EscapeBuilderName( |
- options.build_properties.get('buildername', 'noname'))]) |
+ EscapeBuilderName(builder_name)]) |
bb_annotations.PrintNamedStep('webgl_conformance_tests') |
RunCmd(['content/test/gpu/run_gpu_test.py', |
'--browser=android-content-shell', 'webgl_conformance', |
'--webgl-conformance-version=1.0.1']) |
+ bb_annotations.PrintNamedStep('gpu_rasterization_tests') |
+ RunCmd(['content/test/gpu/run_gpu_test.py', |
+ 'gpu_rasterization', |
+ '--browser', |
+ 'android-content-shell', |
+ '--build-revision', |
+ str(revision), |
+ '--test-machine-name', |
+ EscapeBuilderName(builder_name)]) |
+ |
def GetTestStepCmds(): |
return [ |