image_test: Check for the correct chrome binaries
chromeos-chrome installs binaries depending on these two USE flags:
app_shell and envoy. This CL checks for the correct binary.
BUG=chromium:530765
TEST=trybot on envoy-jerry, veyron_rialto, and generic-x86
Change-Id: Ica66b898fe0d659c1ba0a6f47456558836c4e72a
Reviewed-on: https://chromium-review.googlesource.com/299550
Commit-Ready: Nam Nguyen <namnguyen@chromium.org>
Tested-by: Nam Nguyen <namnguyen@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/cros/test/image_test.py b/cros/test/image_test.py
index 15d442d..9016da1 100644
--- a/cros/test/image_test.py
+++ b/cros/test/image_test.py
@@ -206,9 +206,13 @@
# When chrome is built with USE="pgo_generate", rootfs chrome is actually a
# symlink to a real binary which is in the stateful partition. So we do not
# check for a valid chrome binary in that case.
- if (not self._IsPackageMerged('chromeos-base/chromeos-chrome[pgo_generate]')
- and self._IsPackageMerged('chromeos-base/chromeos-chrome')):
- binaries.append('opt/google/chrome/chrome')
+ if not self._IsPackageMerged('chromeos-base/chromeos-chrome[pgo_generate]'):
+ if self._IsPackageMerged('chromeos-base/chromeos-chrome[app_shell]'):
+ binaries.append('opt/google/chrome/app_shell')
+ elif self._IsPackageMerged('chromeos-base/chromeos-chrome[envoy]'):
+ binaries.append('opt/google/chrome/envoy_shell')
+ elif self._IsPackageMerged('chromeos-base/chromeos-chrome'):
+ binaries.append('opt/google/chrome/chrome')
binaries = [os.path.join(image_test_lib.ROOT_A, x) for x in binaries]
