Add tests from existing old-style control.faft to new-style faft suite.
Added SUITE tag to control files. Also noticed that a few control
files lacked explicit specification of dev_mode and tag so added that.
BUG=chromium-os:32859
TEST=run_remote_tests.sh --board=daisy --remote=... suite:faft
Change-Id: I16ce7c08b4e046dfbca9147ecac05743db475577
Reviewed-on: https://gerrit.chromium.org/gerrit/28303
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
Commit-Ready: Mike Truty <truty@chromium.org>
Tested-by: Mike Truty <truty@chromium.org>
diff --git a/server/site_tests/firmware_CgptState/control b/server/site_tests/firmware_CgptState/control
index 423c862..87b3ab3 100644
--- a/server/site_tests/firmware_CgptState/control
+++ b/server/site_tests/firmware_CgptState/control
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_CgptState"
PURPOSE = "Servo based executing the CgptState test on client side."
CRITERIA = "This test will fail if cgpt mis-behaves"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
@@ -24,6 +25,7 @@
def run_cgptstate(machine):
host = hosts.create_host(machine)
job.run_test("firmware_CgptState", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ use_faft=True, disable_sysinfo=True,
+ dev_mode=False, tag="normal")
parallel_simple(run_cgptstate, machines)
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control.both b/server/site_tests/firmware_CorruptBothFwBodyAB/control.both
index 92520be..b7778c0 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.both
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_CorruptFwBodyAB"
PURPOSE = "Servo based both firmware body A and B corruption test"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
@@ -15,7 +16,7 @@
This test corrupts both firmware body A and B and checks the next boot results.
The expected behavior is different if the firmware preamble USE_RO_NORMAL
-flag is enabled. In the case USE_RO_NORMAL ON, the firmware corruption
+flag is enabled. In the case USE_RO_NORMAL ON, the firmware corruption
doesn't hurt the boot results since it boots the RO path directly and does
not load and verify the RW firmware body. In the case USE_RO_NORMAL OFF,
the firmware verification fails on loading RW firmware and enters recovery
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control.both b/server/site_tests/firmware_CorruptBothFwSigAB/control.both
index 5a400ec..f86bb0d 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.both
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_CorruptFwSigAB"
PURPOSE = "Servo based both firmware signature A and B corruption test"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control.both b/server/site_tests/firmware_CorruptBothKernelAB/control.both
index 91a6b8f..6966a34 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control.both
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_CorruptKernelAB"
PURPOSE = "Servo based both kernel A and B corruption test"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control.both b/server/site_tests/firmware_CorruptFwBodyA/control.both
index a5cad1b..8e5baf3 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control.both
+++ b/server/site_tests/firmware_CorruptFwBodyA/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_CorruptFwBodyA"
PURPOSE = "Servo based firmware A body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control.both b/server/site_tests/firmware_CorruptFwBodyB/control.both
index 1196090..f94374d 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control.both
+++ b/server/site_tests/firmware_CorruptFwBodyB/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_CorruptFwBodyB"
PURPOSE = "Servo based firmware B body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwSigA/control.both b/server/site_tests/firmware_CorruptFwSigA/control.both
index 420150b..1f7bf96 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control.both
+++ b/server/site_tests/firmware_CorruptFwSigA/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_CorruptFwSigA"
PURPOSE = "Servo based firmware A signature corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwSigB/control.both b/server/site_tests/firmware_CorruptFwSigB/control.both
index 9e1ca2b..71d83f0 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control.both
+++ b/server/site_tests/firmware_CorruptFwSigB/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_CorruptFwSigB"
PURPOSE = "Servo based firmware signature B corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptKernelA/control.both b/server/site_tests/firmware_CorruptKernelA/control.both
index 3768272..92b0644 100644
--- a/server/site_tests/firmware_CorruptKernelA/control.both
+++ b/server/site_tests/firmware_CorruptKernelA/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_CorruptKernelA"
PURPOSE = "Servo based kernel A corruption test"
CRITERIA = "This test will fail if kernel verification mis-behaved"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptKernelB/control.both b/server/site_tests/firmware_CorruptKernelB/control.both
index 79c1a1f..e43fcad 100644
--- a/server/site_tests/firmware_CorruptKernelB/control.both
+++ b/server/site_tests/firmware_CorruptKernelB/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_CorruptKernelB"
PURPOSE = "Servo based kernel B corruption test"
CRITERIA = "This test will fail if kernel verification mis-behaved"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevFwNormalBoot/control b/server/site_tests/firmware_DevFwNormalBoot/control
index 50b0f3b..a027719 100644
--- a/server/site_tests/firmware_DevFwNormalBoot/control
+++ b/server/site_tests/firmware_DevFwNormalBoot/control
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_DevFwNormalBoot"
PURPOSE = "Servo based test forcing normal boot on dev firmware"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
@@ -22,6 +23,7 @@
def run_devfwnormalboot(machine):
host = hosts.create_host(machine)
job.run_test("firmware_DevFwNormalBoot", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ use_faft=True, disable_sysinfo=True,
+ dev_mode=True, tag="dev",
parallel_simple(run_devfwnormalboot, machines)
diff --git a/server/site_tests/firmware_DevMode/control b/server/site_tests/firmware_DevMode/control
index 061921f..0d00a5d 100644
--- a/server/site_tests/firmware_DevMode/control
+++ b/server/site_tests/firmware_DevMode/control
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_DevMode"
PURPOSE = "Servo based developer firmware boot test"
CRITERIA = "This test will fail if firmware does not switch to developer mode"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
@@ -18,6 +19,7 @@
def run_devmode(machine):
host = hosts.create_host(machine)
job.run_test("firmware_DevMode", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ use_faft=True, disable_sysinfo=True,
+ dev_mode=False, tag="normal")
parallel_simple(run_devmode, machines)
diff --git a/server/site_tests/firmware_DevScreenTimeout/control b/server/site_tests/firmware_DevScreenTimeout/control
index 4977489..5de52d1 100644
--- a/server/site_tests/firmware_DevScreenTimeout/control
+++ b/server/site_tests/firmware_DevScreenTimeout/control
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_DevScreenTimeout"
PURPOSE = "Servo based developer firmware screen timeout test"
CRITERIA = "This test will fail if the timeout period does not match our spec."
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
@@ -26,6 +27,7 @@
def run_devscreentimeout(machine):
host = hosts.create_host(machine)
job.run_test("firmware_DevScreenTimeout", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ use_faft=True, disable_sysinfo=True,
+ dev_mode=True, tag="dev",
parallel_simple(run_devscreentimeout, machines)
diff --git a/server/site_tests/firmware_DevTriggerRecovery/control b/server/site_tests/firmware_DevTriggerRecovery/control
index d62e7ef..eae6140 100644
--- a/server/site_tests/firmware_DevTriggerRecovery/control
+++ b/server/site_tests/firmware_DevTriggerRecovery/control
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_DevTriggerRecovery"
PURPOSE = "Servo based recovery boot triggered by pressing a key at dev screen"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
@@ -21,6 +22,7 @@
def run_devtriggerrecovery(machine):
host = hosts.create_host(machine)
job.run_test("firmware_DevTriggerRecovery", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ use_faft=True, disable_sysinfo=True,
+ dev_mode=False, tag="normal")
parallel_simple(run_devtriggerrecovery, machines)
diff --git a/server/site_tests/firmware_ECCorruptFwBodyA/control.both b/server/site_tests/firmware_ECCorruptFwBodyA/control.both
index 3bd0b16..ea1a316 100644
--- a/server/site_tests/firmware_ECCorruptFwBodyA/control.both
+++ b/server/site_tests/firmware_ECCorruptFwBodyA/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_ECCorruptFwBodyA"
PURPOSE = "Servo based EC firmware A body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_ECCorruptFwSigA/control.both b/server/site_tests/firmware_ECCorruptFwSigA/control.both
index bf435fd..e022a62 100644
--- a/server/site_tests/firmware_ECCorruptFwSigA/control.both
+++ b/server/site_tests/firmware_ECCorruptFwSigA/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_ECCorruptFwSigA"
PURPOSE = "Servo based EC firmware A signature corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_FwScreenCloseLid/control b/server/site_tests/firmware_FwScreenCloseLid/control
index faa92c5..780d78b 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/control
+++ b/server/site_tests/firmware_FwScreenCloseLid/control
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_FwScreenCloseLid"
PURPOSE = "Servo based lid close triggered shutdown during firmware screens."
CRITERIA = "This test will fail if DUT doesn't shutdown"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
@@ -21,6 +22,7 @@
def run_fwscreencloselid(machine):
host = hosts.create_host(machine)
job.run_test("firmware_FwScreenCloseLid", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ use_faft=True, disable_sysinfo=True,
+ dev_mode=False, tag="normal")
parallel_simple(run_fwscreencloselid, machines)
diff --git a/server/site_tests/firmware_FwScreenPressPower/control b/server/site_tests/firmware_FwScreenPressPower/control
index b90ddbe..f0bab82 100644
--- a/server/site_tests/firmware_FwScreenPressPower/control
+++ b/server/site_tests/firmware_FwScreenPressPower/control
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_FwScreenPressPower"
PURPOSE = "Servo based power button triggered shutdown during firmware screens."
CRITERIA = "This test will fail if DUT doesn't shutdown"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
@@ -21,6 +22,7 @@
def run_fwscreenpresspower(machine):
host = hosts.create_host(machine)
job.run_test("firmware_FwScreenPressPower", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ use_faft=True, disable_sysinfo=True,
+ dev_mode=False, tag="normal")
parallel_simple(run_fwscreenpresspower, machines)
diff --git a/server/site_tests/firmware_InvalidUSB/control b/server/site_tests/firmware_InvalidUSB/control
index 0550950..e18ef34 100644
--- a/server/site_tests/firmware_InvalidUSB/control
+++ b/server/site_tests/firmware_InvalidUSB/control
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_InvalidUSB"
PURPOSE = "Servo based booting an invalid USB image test"
CRITERIA = "This test will fail if the invalid USB boots successfully"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
@@ -21,6 +22,7 @@
def run_invalidusb(machine):
host = hosts.create_host(machine)
job.run_test("firmware_InvalidUSB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ use_faft=True, disable_sysinfo=True,
+ dev_mode=False, tag="normal")
parallel_simple(run_invalidusb, machines)
diff --git a/server/site_tests/firmware_RecoveryButton/control.both b/server/site_tests/firmware_RecoveryButton/control.both
index 7ef2025..2fb4ad6 100644
--- a/server/site_tests/firmware_RecoveryButton/control.both
+++ b/server/site_tests/firmware_RecoveryButton/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_RecoveryButton"
PURPOSE = "Press recovery button and check for recovery boot"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_TryFwB/control.both b/server/site_tests/firmware_TryFwB/control.both
index b2f8276..54a176c 100644
--- a/server/site_tests/firmware_TryFwB/control.both
+++ b/server/site_tests/firmware_TryFwB/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_TryFwB"
PURPOSE = "Servo based RW firmware B boot test"
CRITERIA = "This test will fail if firmware does not switch to firmware B"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.both b/server/site_tests/firmware_UserRequestRecovery/control.both
index 41a2e52..fdfd692 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.both
+++ b/server/site_tests/firmware_UserRequestRecovery/control.both
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,7 @@
NAME = "firmware_UserRequestRecovery"
PURPOSE = "Request recovery mode and check it next reboot."
CRITERIA = "This test will fail if firmware does not enter recovery mode"
+SUITE = "faft"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"