commit 086bc3f0c5e3655b0022fbe241bf0866853cd52b
author Ilja H. Friedel <ihf@chromium.org> Thu Feb 27 22:17:55 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Mar 07 03:41:44 2014 +0000
tree f8fcee58eeaa2d98b9865af14c2f11ccfa1c57f3
parent 8577f8fb064fc8392bdc399fdd7465307d6da03b

Add server side webgl conformance test.

BUG=chromium:341333
TEST=None.

Change-Id: Ibd6539ab229e83eabf820ac296662d3b7c52f186
Reviewed-on: https://chromium-review.googlesource.com/188330
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Ilja Friedel <ihf@chromium.org>
Commit-Queue: Ilja Friedel <ihf@chromium.org>
Tested-by: Ilja Friedel <ihf@chromium.org>

server/cros/telemetry_runner.py

diff --git a/server/cros/telemetry_runner.py b/server/cros/telemetry_runner.py
index 7c46088..9f2396a 100644
--- a/server/cros/telemetry_runner.py
+++ b/server/cros/telemetry_runner.py
@@ -14,8 +14,9 @@
 
 
 TELEMETRY_RUN_BENCHMARKS_SCRIPT = 'tools/perf/run_benchmark'
-TELEMETRY_RUN_TESTS_SCRIPT = 'tools/telemetry/run_tests'
 TELEMETRY_RUN_CROS_TESTS_SCRIPT = 'chrome/test/telemetry/run_cros_tests'
+TELEMETRY_RUN_GPU_TESTS_SCRIPT = 'content/test/gpu/run_gpu_test'
+TELEMETRY_RUN_TESTS_SCRIPT = 'tools/telemetry/run_tests'
 TELEMETRY_TIMEOUT_MINS = 120
 
 # Result Statuses
@@ -380,6 +381,17 @@
         return self._run_test(TELEMETRY_RUN_CROS_TESTS_SCRIPT, test)
 
 
+    def run_gpu_test(self, test):
+        """Runs a gpu test on a dut.
+
+        @param test: Gpu test we want to run.
+
+        @returns A TelemetryResult instance with the results of this telemetry
+                 execution.
+        """
+        return self._run_test(TELEMETRY_RUN_GPU_TESTS_SCRIPT, test)
+
+
     @staticmethod
     def _output_perf_value(perf_value_writer, perf_data):
         """Output perf values to result dir.