Skip to content

Commit 54ff3e5

Browse files
liuyqmwasilew
authored and
mwasilew
committed
noninteractive-tradefed: use grep to workaround Bad substitution problem
reported like following: /lava-610173/1/tests/1_cts-focused2-armeabi-v7a/run.sh: 35: /lava-610173/1/tests/1_cts-focused2-armeabi-v7a/run.sh: Bad substitution but not sure why this problem only happens for x15 jobs, jobs for hikey builds could work without problem Change-Id: I4dbaf0670f82bec69e2146d8cf91974feaf86dc1 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
1 parent 02dacb5 commit 54ff3e5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

automated/android/noninteractive-tradefed/tradefed.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ run:
5151
# create test use to run the cts/vts tests
5252
- useradd -m testuser && echo "testuser created successfully"
5353
- chown testuser:testuser .
54-
- if [ "${TEST_REBOOT_EXPECTED,,}" = "true" ]; then ./monitor_fastboot.sh & fi
54+
- if echo "${TEST_REBOOT_EXPECTED}" |grep -i "true" ; then ./monitor_fastboot.sh & fi
5555
- ./monitor_adb.sh &
5656
- sudo -u testuser ./tradefed.sh -o "${TIMEOUT}" -c "${TEST_URL}" -t "${TEST_PARAMS}" -p "${TEST_PATH}" -r "${RESULTS_FORMAT}" -n "${ANDROID_SERIAL}" -f "${FAILURES_PRINTED}" -a "${AP_SSID}" -k "${AP_KEY}"
5757
# Upload test log and result files to artifactorial.
@@ -67,5 +67,5 @@ run:
6767
- userdel testuser -f -r || true
6868
# When adb device lost, end test job to mark it as 'incomplete'.
6969
- if ! adb shell echo ok; then error_fatal "adb device $ANDROID_SERIAL lost!"; fi
70-
- if [ "${TEST_REBOOT_EXPECTED,,}" = "true" ]; then killall monitor_fastboot.sh; fi
70+
- if echo "${TEST_REBOOT_EXPECTED}" |grep -i "true" ; then killall monitor_fastboot.sh; fi
7171
- killall monitor_adb.sh

0 commit comments

Comments
 (0)