Re-land: Allow us to run HWTests on any builder type.
This CL removes the last of the dependencies (namely archive_build_debug) from
being required for hw_tests to be set. This will allow us to add HWTests
to any build configuration.
Originally reviewed in: Icd1ffc1849e6857f32ed5c5438bf3b04f19dbeec
BUG=chromium-os:27165
TEST=Ran autotest-experimental through without archive_build_debug set to
True.
Change-Id: I0281715b1f84218a96b266161aca1063c7807428
Reviewed-on: https://gerrit.chromium.org/gerrit/17378
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Ready: Chris Sosa <sosa@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index abc6341..6c615d5 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -360,14 +360,17 @@
steps.append(vm_test_stage.Run)
if self.build_config['chrome_tests']:
steps.append(chrome_test_stage.Run)
- if self.options.archive:
- for suite in self.build_config['hw_tests']:
- hw_test_stage = self._GetStageInstance(
- stages.HWTestStage,
- board,
- archive_stage=archive_stage,
- suite=suite)
- steps.append(hw_test_stage.Run)
+
+ # We can not run hw tests without archiving the payloads.
+ if self.options.archive:
+ for suite in self.build_config['hw_tests']:
+ hw_test_stage = self._GetStageInstance(
+ stages.HWTestStage,
+ board,
+ archive_stage=archive_stage,
+ suite=suite)
+ steps.append(hw_test_stage.Run)
+
steps += [unit_test_stage.Run, prebuilts_stage.Run]
# Run the steps in parallel. If any exceptions occur, RunParallelSteps
# will combine them into a single BackgroundException and throw it.