diff options
| author | Jian Cai <jiancai@google.com> | 2019-06-21 14:39:42 -0700 |
|---|---|---|
| committer | Jian Cai <jiancai@google.com> | 2019-06-27 20:16:02 +0000 |
| commit | 5a14390efe9009979f4c5fe8134eab728f298ba1 (patch) | |
| tree | 4209fe20c54775cedce9c8a10f6e72cae40f6df5 /image_chromeos.py | |
| parent | aa31116c1d7c2491245604f0564e0693f22dfd71 (diff) | |
| download | toolchain-utils-5a14390efe9009979f4c5fe8134eab728f298ba1.tar.gz | |
toolchain-utils: enable crosperf for llvm-toolchain images
Currently crosperf checks the image it runs on by checking if there is a
"test" on the CHROMEOS_RELEASE_DESCRIPTION in the lsb_release file.
ChromeOS images built by llvm-toolchain does not have this word, so crosperf
always fails to run on such images. This change fixes this issue by
checking CHROMEOS_RELEASE_TRACK instead.
BUG=chromium:977705
TEST=Local tests.
Change-Id: I85025f02c32fcfdc1a3d3e8443350b215ffe83e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1672131
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Jian Cai <jiancai@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Diffstat (limited to 'image_chromeos.py')
| -rwxr-xr-x | image_chromeos.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/image_chromeos.py b/image_chromeos.py index bea6fe57..11836ce9 100755 --- a/image_chromeos.py +++ b/image_chromeos.py @@ -405,8 +405,7 @@ def IsImageModdedForTest(chromeos_root, image, log_level): rootfs_mp = rootfs_mp.strip() stateful_mp = stateful_mp.strip() lsb_release_file = os.path.join(rootfs_mp, 'etc/lsb-release') - extra = ( - 'grep CHROMEOS_RELEASE_DESCRIPTION %s | grep -i test' % lsb_release_file) + extra = ('grep CHROMEOS_RELEASE_TRACK %s | grep -i test' % lsb_release_file) output = MountImage( chromeos_root, image, |