diff options
| -rwxr-xr-x | lava_android_test/test_definitions/cts/cts_wrapper.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lava_android_test/test_definitions/cts/cts_wrapper.py b/lava_android_test/test_definitions/cts/cts_wrapper.py index 2ba9ccd..6381b17 100755 --- a/lava_android_test/test_definitions/cts/cts_wrapper.py +++ b/lava_android_test/test_definitions/cts/cts_wrapper.py @@ -56,6 +56,7 @@ def stop_at_cts_pattern(command=None, pattern=None, timeout=-1): finally: proc_cts.sendcontrol('C') proc_cts.sendline('') + target_dir = os.path.join(os.getcwd(), './android-cts/repository/results/') for zip_f in find_files(target_dir, '.zip'): @@ -76,13 +77,13 @@ def stop_at_cts_pattern(command=None, pattern=None, timeout=-1): if ret_code != 0: print "Failed to push file %s to device(%s)" % (zip_f, adb.get_serial()) - with ZipFile(zip_f) as log_fd: - print '=========Log file [%s] starts=========>>>>>' % ( - base_name) - f_name = base_name.replace('.zip', '.txt') - for line in log_fd.open(f_name).readlines(): - print line.rstrip() - print '<<<<<=========Log file [%s] ends=========' % base_name +# with ZipFile(zip_f) as log_fd: +# print '=========Log file [%s] starts=========>>>>>' % ( +# base_name) +# f_name = base_name.replace('.zip', '.txt') +# for line in log_fd.open(f_name).readlines(): +# print line.rstrip() +# print '<<<<<=========Log file [%s] ends=========' % base_name return result @@ -338,8 +339,7 @@ def main(): else: run_cts_with_plan(cts_cmd=run_wrapper_cmd, plan=plan_name, timeout=timeout) - - run_cts_continue(cts_cmd=run_wrapper_cmd) + run_cts_continue(cts_cmd=run_wrapper_cmd, timeout=timeout) finally: for log in logs: |