Revert "Allow us to run HWTests on any builder type."
This broke the tree. See http://build.chromium.org/p/chromiumos/builders/arm%20generic%20full/builds/2191
This reverts commit dadfd6f247af15e4350dda4365a5c30af071d159
BUG=chromium-os:27165
TEST=none
Change-Id: I911fe40fa7a61e0f07fdac347ee51db5b683cb46
Reviewed-on: https://gerrit.chromium.org/gerrit/17293
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index b2ba0f3..43bfb39 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -360,17 +360,14 @@
steps.append(vm_test_stage.Run)
if self.build_config['chrome_tests']:
steps.append(chrome_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)
-
+ 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.