diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2017-07-07 18:48:43 +0000 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2017-07-07 18:48:47 +0000 |
| commit | 33386624e01e460de7c69ca91e05a8c237f653d4 (patch) | |
| tree | edfae2f2333018a735d9009623a62454e978b357 /jjb | |
| parent | 85f3007ed0c7e4c926d083a1c34cda519b935507 (diff) | |
run-test-prepare: fix device environment overrides
Machines can override the default environment settings in their
hwtest.short.environment files. However, the grep/sed procesing done
does not ignore lines that are commented out, causing an extra '#' to
be part of the variable name.
To fix, ensure the grep for the variable name matches the beginning of
the line, so commented lines will be ignored.
Change-Id: Ibf4281c3126c95670346bee74043d670e6d58654
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/common/include-agl-run-test-prepare.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh index 06a833c4..b861a360 100644 --- a/jjb/common/include-agl-run-test-prepare.sh +++ b/jjb/common/include-agl-run-test-prepare.sh @@ -63,7 +63,7 @@ export DEVICE_URL_PREFIX='https://download.automotivelinux.org/AGL/upload/ci/' # import device defaults. Format 'a=b' for i in DEVICE_TYPE DEVICE_NAME DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_NBDROOT DEVICE_NBDROOT_COMPRESSION DEVICE_BOOT_METHOD DEVICE_BOOT_TYPE DEVICE_URL_PREFIX; do - if grep -q $i $ENVFILE ; then + if grep -q ^$i $ENVFILE ; then X=$(grep $i $ENVFILE | sed -e "s#${i}=##g" -e "s#;.*##g") eval export ${i}=${X} fi |