Skip to content

Commit f0bf55f

Browse files
authored
Merge branch 'Linaro:master' into master
2 parents a80241d + 671cc1f commit f0bf55f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

automated/android/noninteractive-tradefed/tradefed.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ run:
6666
- chown testuser:testuser .
6767
- if echo "${TEST_REBOOT_EXPECTED}" |grep -i "true" ; then ./monitor_fastboot.sh & fi
6868
- ./monitor_adb.sh &
69-
- 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}" -i "${INTERNET_ACCESS}" -x "${ENABLE_XTS_DYNAMIC_DOWNLOADER}"|| if [ $? -eq 100 ]; then error_fatal "The network seems not available, as the ping command failed"; else true; fi
69+
- sudo -u testuser HTTP_CACHE="${HTTP_CACHE}" ./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}" -i "${INTERNET_ACCESS}" -x "${ENABLE_XTS_DYNAMIC_DOWNLOADER}"|| if [ $? -eq 100 ]; then error_fatal "The network seems not available, as the ping command failed"; else true; fi
7070
# Upload test log and result files to artifactorial.
7171
- cp -r ./${TEST_PATH}/results ./output/ || true
7272
- cp -r ./${TEST_PATH}/logs ./output/ || true

automated/utils/send-to-lava.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [ -f "${RESULT_FILE}" ]; then
4040
if [ "${lava_test_case}" -eq 0 ]; then
4141
lava-test-case "${test}" --result "${result}"
4242
else
43-
echo "<TEST_CASE_ID=${test} RESULT=${result}>"
43+
signal "<LAVA_SIGNAL_TESTCASE TEST_CASE_ID=${test} RESULT=${result}>"
4444
fi
4545
elif echo "${line}" | grep -iq -E ".*+ (pass|fail|skip|unknown)+ .*+"; then
4646
test="$(echo "${line}" | awk '{print $1}')"
@@ -56,7 +56,7 @@ if [ -f "${RESULT_FILE}" ]; then
5656
lava-test-case "${test}" --result "${result}" --measurement "${measurement}"
5757
fi
5858
else
59-
echo "<TEST_CASE_ID=${test} RESULT=${result} MEASUREMENT=${measurement} UNITS=${units}>"
59+
signal "<LAVA_SIGNAL_TESTCASE TEST_CASE_ID=${test} RESULT=${result} MEASUREMENT=${measurement} UNITS=${units}>"
6060
fi
6161
elif echo "${line}" | grep -iq -E "^lava-test-set.*"; then
6262
test_set_status="$(echo "${line}" | awk '{print $2}')"

0 commit comments

Comments
 (0)