video_PowerConsumption: fix for rapl support
As arms and older intel devices does not support rdmsr, only
add rapl power measurement to the test if we support it.
BUG=chromium:793703
TEST=test_that link video_PowerConsumption.vp8
Change-Id: I9878c01021fde62b4cfa10f1287d249f05d17baa
Reviewed-on: https://chromium-review.googlesource.com/818743
Commit-Ready: Po-Hsien Wang <pwang@chromium.org>
Tested-by: Po-Hsien Wang <pwang@chromium.org>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
(cherry picked from commit bc63fb47a997b7f9bee27b76fecc757db75d6844)
Reviewed-on: https://chromium-review.googlesource.com/821494
Reviewed-by: Po-Hsien Wang <pwang@chromium.org>
Commit-Queue: Po-Hsien Wang <pwang@chromium.org>
Trybot-Ready: Po-Hsien Wang <pwang@chromium.org>
diff --git a/client/site_tests/video_PlaybackPerf/video_PlaybackPerf.py b/client/site_tests/video_PlaybackPerf/video_PlaybackPerf.py
index 1d49649..0bf608f 100644
--- a/client/site_tests/video_PlaybackPerf/video_PlaybackPerf.py
+++ b/client/site_tests/video_PlaybackPerf/video_PlaybackPerf.py
@@ -238,7 +238,9 @@
self._power_status.assert_battery_state(BATTERY_INITIAL_CHARGED_MIN)
measurements = [power_status.SystemPower(
- self._power_status.battery_path)] + power_rapl.create_rapl()
+ self._power_status.battery_path)]
+ if power_utils.has_rapl_support():
+ measurements += power_rapl.create_rapl()
def get_power(cr):
power_logger = power_status.PowerLogger(measurements)
