diff options
Diffstat (limited to 'tester/rt/test.py')
| -rw-r--r-- | tester/rt/test.py | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/tester/rt/test.py b/tester/rt/test.py index b0e041a..c118382 100644 --- a/tester/rt/test.py +++ b/tester/rt/test.py @@ -1,6 +1,6 @@ # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2013-2014 Chris Johns (chrisj@rtems.org) +# Copyright 2013-2016 Chris Johns (chrisj@rtems.org) # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -28,8 +28,11 @@ # POSSIBILITY OF SUCH DAMAGE. # +from __future__ import print_function + import copy import datetime +import fnmatch import os import sys import threading @@ -41,12 +44,11 @@ from rtemstoolkit import path from rtemstoolkit import stacktraces from rtemstoolkit import version -import bsps -import config -import console -import options -import report -import fnmatch +from . import bsps +from . import config +from . import console +from . import options +from . import report class test(object): def __init__(self, index, total, report, executable, rtems_tools, bsp, bsp_config, opts): @@ -118,7 +120,7 @@ class test_run(object): def reraise(self): if self.result is not None: - raise self.result[0], self.result[1], self.result[2] + raise self.result[0](self.result[1]).with_traceback(self.result[2]) def kill(self): if self.test: @@ -157,9 +159,9 @@ def report_finished(reports, report_mode, reporting, finished, job_trace): if len(reported): del reported[:] if job_trace: - print '}} threading:', threading.active_count() + print('}} threading:', threading.active_count()) for t in threading.enumerate(): - print '}} ', t.name + print('}} ', t.name) return reporting def _job_trace(tst, msg, total, exe, active, reporting): @@ -302,20 +304,20 @@ def run(command_path = None): end_time = datetime.datetime.now() log.notice('Average test time: %s' % (str((end_time - start_time) / total))) log.notice('Testing time : %s' % (str(end_time - start_time))) - except error.general, gerr: - print gerr + except error.general as gerr: + print(gerr) sys.exit(1) - except error.internal, ierr: - print ierr + except error.internal as ierr: + print(ierr) sys.exit(1) - except error.exit, eerr: + except error.exit as eerr: sys.exit(2) except KeyboardInterrupt: if opts is not None and opts.find_arg('--stacktrace'): - print '}} dumping:', threading.active_count() + print('}} dumping:', threading.active_count()) for t in threading.enumerate(): - print '}} ', t.name - print stacktraces.trace() + print('}} ', t.name) + print(stacktraces.trace()) log.notice('abort: user terminated') killall(tests) sys.exit(1) |