commit 8135081fdc2dc98922a2a3393b918d4fefe42f47
author Jon Salz <jsalz@chromium.org> Thu Oct 11 16:13:22 2012 +0800
committer Gerrit <chrome-bot@google.com> Thu Oct 11 21:30:43 2012 -0700
tree c960378b13105a3d2d2b8fa449f673d2685f8ef3
parent 76bbf1ffc89b46109a340c1595048254a75066f9

Fix volatile handling.  Don't read local firmware if not necessary.

Also add verify_hwid_test using fake data.

BUG=None
TEST=verify_hwid_test.py

Change-Id: Ia1c82632082c215d1231788966d4d6a3bd417e51
Reviewed-on: https://gerrit.chromium.org/gerrit/35259
Reviewed-by: Andy Cheng <andycheng@chromium.org>
Commit-Ready: Jon Salz <jsalz@chromium.org>
Reviewed-by: Jon Salz <jsalz@chromium.org>
Tested-by: Jon Salz <jsalz@chromium.org>

py/gooftool/gooftool.py

diff --git a/py/gooftool/gooftool.py b/py/gooftool/gooftool.py
index 5ea465e..486037b 100755
--- a/py/gooftool/gooftool.py
+++ b/py/gooftool/gooftool.py
@@ -402,7 +402,8 @@
     _event_log.Log('vpd', ro_vpd=FilterVPD(ro_vpd), rw_vpd=FilterVPD(rw_vpd))
   map(hwid_tool.Validate.Status, options.status)
 
-  main_fw_file = crosfw.LoadMainFirmware().GetFileName()
+  if not options.hwid or not options.probe_results:
+    main_fw_file = crosfw.LoadMainFirmware().GetFileName()
 
   if options.hwid:
     hwid_str = options.hwid