diff options
Diffstat (limited to 'automated')
| -rwxr-xr-x | automated/android/cts/cts-runner.py | 9 | ||||
| -rwxr-xr-x | automated/android/cts/cts.sh | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/automated/android/cts/cts-runner.py b/automated/android/cts/cts-runner.py index aa25e21..50589e3 100755 --- a/automated/android/cts/cts-runner.py +++ b/automated/android/cts/cts-runner.py @@ -141,7 +141,14 @@ while child.isalive(): try: # Check if all tests finished every minute. - child.expect('I/ResultReporter: Full Result:', timeout=60) + m = child.expect(['I/ResultReporter: Full Result:', + 'I/ConsoleReporter:.*Test run failed to complete.'], + timeout=60) + if m == 0: + py_test_lib.add_result(RESULT_FILE, 'cts-test-run pass') + elif m == 1: + py_test_lib.add_result(RESULT_FILE, 'cts-test-run fail') + # Once all tests finshed, exit from tf shell and throw EOF. child.sendline('exit') child.expect(pexpect.EOF, timeout=60) diff --git a/automated/android/cts/cts.sh b/automated/android/cts/cts.sh index 34e56a7..9f5bdc3 100755 --- a/automated/android/cts/cts.sh +++ b/automated/android/cts/cts.sh @@ -81,7 +81,6 @@ fi # Run CTS test. ./cts-runner.py -t "${TEST_PARAMS}" -n "${SN}" -check_return "cts-test-run" # Cleanup. rm -f /etc/apt/sources.list.d/cts.list |