diff options
| author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2019-02-04 09:49:52 +0000 |
|---|---|---|
| committer | mwasilew <milosz.wasilewski@linaro.org> | 2019-02-04 14:32:06 +0000 |
| commit | 54f3d044267bdaa7448300814b93781579e21321 (patch) | |
| tree | 69f88431d92b3eea63ddef6dd5db4da72f1b53e4 | |
| parent | ea543cee6a0ea97aabdd085a20be9493053f6be9 (diff) | |
android/tradefed: improve reboot variable comparison
Make sure that comparison is case insensitive to catch any possible
reboot in LAVA. Also align the comparison condition between different
tradefed implementations.
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
| -rw-r--r-- | automated/android/noninteractive-tradefed/tradefed.yaml | 4 | ||||
| -rw-r--r-- | automated/android/tradefed/tradefed.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/automated/android/noninteractive-tradefed/tradefed.yaml b/automated/android/noninteractive-tradefed/tradefed.yaml index ab174ee..fbb5635 100644 --- a/automated/android/noninteractive-tradefed/tradefed.yaml +++ b/automated/android/noninteractive-tradefed/tradefed.yaml @@ -51,7 +51,7 @@ run: # create test use to run the cts/vts tests - useradd -m testuser && echo "testuser created successfully" - chown testuser:testuser . - - if [ "X${TEST_REBOOT_EXPECTED}" = "XTrue" ]; then ./monitor_fastboot.sh & fi + - if [ "${TEST_REBOOT_EXPECTED,,}" = "true" ]; then ./monitor_fastboot.sh & fi - 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}" # Upload test log and result files to artifactorial. - cp -r ./${TEST_PATH}/results ./output/ || true @@ -66,4 +66,4 @@ run: - userdel testuser -f -r || true # When adb device lost, end test job to mark it as 'incomplete'. - if ! adb shell echo ok; then error_fatal "adb device $ANDROID_SERIAL lost!"; fi - - if [ "X${TEST_REBOOT_EXPECTED}" = "XTrue" ]; then killall monitor_fastboot.sh; fi + - if [ "${TEST_REBOOT_EXPECTED,,}" = "true" ]; then killall monitor_fastboot.sh; fi diff --git a/automated/android/tradefed/tradefed.yaml b/automated/android/tradefed/tradefed.yaml index 946f40e..38b7d3c 100644 --- a/automated/android/tradefed/tradefed.yaml +++ b/automated/android/tradefed/tradefed.yaml @@ -52,7 +52,7 @@ run: # create test use to run the cts/vts tests - useradd -m testuser && echo "testuser created successfully" - chown testuser:testuser . - - if [[ ${TEST_REBOOT_EXPECTED} == "True" ]]; then ./monitor_fastboot.sh & fi + - if [ "${TEST_REBOOT_EXPECTED,,}" = "true" ]; then ./monitor_fastboot.sh & fi - 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}" -j "${JAVA_OPTIONS}" # Upload test log and result files to artifactorial. - cp -r ./${TEST_PATH}/results ./output/ || true @@ -67,4 +67,4 @@ run: - userdel testuser -f -r || true # When adb device lost, end test job to mark it as 'incomplete'. - if ! adb shell echo ok; then error_fatal "adb device $ANDROID_SERIAL lost!"; fi - - if [[ ${TEST_REBOOT_EXPECTED} == "True" ]]; then killall monitor_fastboot.sh; fi + - if [ "${TEST_REBOOT_EXPECTED,,}" = "true" ]; then killall monitor_fastboot.sh; fi |