Merge branch 'master' into ywang2/analysis_result_automatically_for_A…

…UTO_plugin

Signed-off-by: Wang, Yang <[email protected]>

demos/tests/run_tests.py

@@ -345,9 +345,15 @@ def option_to_args(key, value):
                                     rawResults += line
                                     rawResults += '\n'
                             demo.parse_output(output, device, test_case_index)
-                        except subprocess.CalledProcessError as e:
-                            print(e.output)
-                            print('Exit code:', e.returncode)
+                        except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e:
+                            output = e.output
+                            if isinstance(e, subprocess.CalledProcessError):
+                                exit_msg = f'Exit code: {e.returncode}\n'
+                            elif isinstance(e, subprocess.TimeoutExpired):
+                                exit_msg = f'Command timed out after {e.timeout} seconds\n'
+                            output += exit_msg
+                            print(output)
+                            failed_tests.append(test_descr + '\n' + exit_msg)
                             num_failures += 1
                             execution_time = -1
                             rawResults = {}
@@ -358,7 +364,13 @@ def option_to_args(key, value):
                         content = ''
                         if args.report_file:
                             collect_result(demo.subdirectory, device, case_model_names, execution_time, args.report_file)
+                        if args.log_file:
+                            if test_case_index == 0:
+                                write_log(header, args.log_file)
+                            write_log(test_descr, args.log_file)
+                            write_log(output, args.log_file)
             fo.close()
+            print()
 
     print("{} failures:".format(num_failures))
     for test in failed_tests: