Add new control file to run in performance suite with
perf uploads.
BUG=chromium:483049
TEST=None
Change-Id: I7ff101b3b5f271ed73085ba2df30e51f9d131782
Previous-Reviewed-on: https://chromium-review.googlesource.com/268516
(cherry picked from commit 36847ffcc6474201538760c1cb29bc3cf57b507d)
Reviewed-on: https://chromium-review.googlesource.com/268669
Reviewed-by: Keith Haddow <haddowk@chromium.org>
Tested-by: Keith Haddow <haddowk@chromium.org>
Commit-Queue: Keith Haddow <haddowk@chromium.org>
diff --git a/server/site_tests/platform_BootPerfServer/control b/server/site_tests/platform_BootPerfServer/control
index 0d14e30..28c1ae6 100644
--- a/server/site_tests/platform_BootPerfServer/control
+++ b/server/site_tests/platform_BootPerfServer/control
@@ -4,7 +4,7 @@
NAME = "BootPerfServer"
AUTHOR = "Chrome OS Team"
-SUITE = "performance, kernel_per-build_benchmarks"
+SUITE = "kernel_per-build_benchmarks"
TIME = "SHORT"
TEST_CATEGORY = "Benchmark"
TEST_CLASS = "platform"
diff --git a/server/site_tests/platform_BootPerfServer/control.crosperf b/server/site_tests/platform_BootPerfServer/control.crosperf
new file mode 100644
index 0000000..65b28b1
--- /dev/null
+++ b/server/site_tests/platform_BootPerfServer/control.crosperf
@@ -0,0 +1,23 @@
+# Copyright (c) 2012 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.
+
+NAME = "BootPerfServerCrosPerf"
+AUTHOR = "Chrome OS Team"
+SUITE = "performance"
+TIME = "SHORT"
+TEST_CATEGORY = "Benchmark"
+TEST_CLASS = "platform"
+TEST_TYPE = "server"
+
+DOC = """
+This test reboots the client and uses the client-side platform_BootPerf test
+to collect boot performance metrics.
+"""
+
+def run_bootperf(machine):
+ host = hosts.create_host(machine)
+ job.run_test("platform_BootPerfServer", host=host,
+ iterations=10, upload_perf=True)
+
+parallel_simple(run_bootperf, machines)
