telemetry: Update list of gpu integration tests
Update list of tests in generate_controlfiles.py, remove stale
control files, generate new control files.
BUG=chromium:879738
TEST=generate control files
Change-Id: I1f5cade3a9e313eaf7bdb405cf30b2a9cac6cd5b
Reviewed-on: https://chromium-review.googlesource.com/1216884
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
diff --git a/server/site_tests/telemetry_GpuTests/control.memory_test b/server/site_tests/telemetry_GpuTests/control.depth_capture
similarity index 82%
copy from server/site_tests/telemetry_GpuTests/control.memory_test
copy to server/site_tests/telemetry_GpuTests/control.depth_capture
index c92da41..32c4ab9 100644
--- a/server/site_tests/telemetry_GpuTests/control.memory_test
+++ b/server/site_tests/telemetry_GpuTests/control.depth_capture
@@ -5,7 +5,7 @@
# Do not edit this file! It was created by generate_controlfiles.py.
AUTHOR = 'chromeos-gfx'
-NAME = 'telemetry_GpuTests.memory_test'
+NAME = 'telemetry_GpuTests.depth_capture'
ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_browser'
TIME = 'LONG'
TEST_CATEGORY = 'Functional'
@@ -13,7 +13,7 @@
TEST_TYPE = 'server'
DOC = '''
-This server control file executes the GPU telemetry test: memory_test.
+This server control file executes the GPU telemetry test: depth_capture.
Pass local=True to run with local telemetry and no AFE server.
'''
@@ -24,7 +24,7 @@
host = hosts.create_host(machine)
job.run_test('telemetry_GpuTests',
host=host,
- test='memory_test',
+ test='depth_capture',
args=utils.args_to_dict(args))
diff --git a/server/site_tests/telemetry_GpuTests/control.gpu_rasterization b/server/site_tests/telemetry_GpuTests/control.gpu_rasterization
deleted file mode 100644
index 4b3f532..0000000
--- a/server/site_tests/telemetry_GpuTests/control.gpu_rasterization
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Do not edit this file! It was created by generate_controlfiles.py.
-
-AUTHOR = 'chromeos-gfx'
-NAME = 'telemetry_GpuTests.gpu_rasterization'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_browser'
-TIME = 'LONG'
-TEST_CATEGORY = 'Functional'
-TEST_CLASS = 'gl'
-TEST_TYPE = 'server'
-
-DOC = '''
-This server control file executes the GPU telemetry test: gpu_rasterization.
-
-Pass local=True to run with local telemetry and no AFE server.
-'''
-
-from autotest_lib.client.common_lib import utils
-
-def run_test(machine):
- host = hosts.create_host(machine)
- job.run_test('telemetry_GpuTests',
- host=host,
- test='gpu_rasterization',
- args=utils.args_to_dict(args))
-
-
-parallel_simple(run_test, machines)
\ No newline at end of file
diff --git a/server/site_tests/telemetry_GpuTests/control.memory_test b/server/site_tests/telemetry_GpuTests/control.info_collection
similarity index 82%
copy from server/site_tests/telemetry_GpuTests/control.memory_test
copy to server/site_tests/telemetry_GpuTests/control.info_collection
index c92da41..75ad31c 100644
--- a/server/site_tests/telemetry_GpuTests/control.memory_test
+++ b/server/site_tests/telemetry_GpuTests/control.info_collection
@@ -5,7 +5,7 @@
# Do not edit this file! It was created by generate_controlfiles.py.
AUTHOR = 'chromeos-gfx'
-NAME = 'telemetry_GpuTests.memory_test'
+NAME = 'telemetry_GpuTests.info_collection'
ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_browser'
TIME = 'LONG'
TEST_CATEGORY = 'Functional'
@@ -13,7 +13,7 @@
TEST_TYPE = 'server'
DOC = '''
-This server control file executes the GPU telemetry test: memory_test.
+This server control file executes the GPU telemetry test: info_collection.
Pass local=True to run with local telemetry and no AFE server.
'''
@@ -24,7 +24,7 @@
host = hosts.create_host(machine)
job.run_test('telemetry_GpuTests',
host=host,
- test='memory_test',
+ test='info_collection',
args=utils.args_to_dict(args))
diff --git a/server/site_tests/telemetry_GpuTests/control.memory_test b/server/site_tests/telemetry_GpuTests/control.noop_sleep
similarity index 83%
rename from server/site_tests/telemetry_GpuTests/control.memory_test
rename to server/site_tests/telemetry_GpuTests/control.noop_sleep
index c92da41..8b112cc 100644
--- a/server/site_tests/telemetry_GpuTests/control.memory_test
+++ b/server/site_tests/telemetry_GpuTests/control.noop_sleep
@@ -5,7 +5,7 @@
# Do not edit this file! It was created by generate_controlfiles.py.
AUTHOR = 'chromeos-gfx'
-NAME = 'telemetry_GpuTests.memory_test'
+NAME = 'telemetry_GpuTests.noop_sleep'
ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_browser'
TIME = 'LONG'
TEST_CATEGORY = 'Functional'
@@ -13,7 +13,7 @@
TEST_TYPE = 'server'
DOC = '''
-This server control file executes the GPU telemetry test: memory_test.
+This server control file executes the GPU telemetry test: noop_sleep.
Pass local=True to run with local telemetry and no AFE server.
'''
@@ -24,7 +24,7 @@
host = hosts.create_host(machine)
job.run_test('telemetry_GpuTests',
host=host,
- test='memory_test',
+ test='noop_sleep',
args=utils.args_to_dict(args))
diff --git a/server/site_tests/telemetry_GpuTests/generate_controlfiles.py b/server/site_tests/telemetry_GpuTests/generate_controlfiles.py
index bf28531..2fd71cf 100755
--- a/server/site_tests/telemetry_GpuTests/generate_controlfiles.py
+++ b/server/site_tests/telemetry_GpuTests/generate_controlfiles.py
@@ -9,11 +9,12 @@
TESTS = [
'context_lost',
+ 'depth_capture',
'gpu_process',
- 'gpu_rasterization',
'hardware_accelerated_feature',
+ 'info_collection',
'maps',
- 'memory_test',
+ 'noop_sleep',
'pixel',
'screenshot_sync',
'trace_test',
