Changes in tests/test.py [0c13238:d3c1c6a]

File:

• tests/test.py (modified) (5 diffs)

tests/test.py

@@ -1 @@
-#!/usr/bin/python
-from __future__ import print_function
+#!/usr/bin/python3
 
 from pybin.tools import *
@@ -102 +101 @@
                 print('ERROR: invalid arguments', file=sys.stderr)
                 parser.print_help(sys.stderr)
-                sys.exit(1)
+                sys.exit(1)
 
         # script must have at least some tests to run or be listing
@@ -112 +111 @@
         # check that exactly one of the booleans is set to true
         if not sum( (listing, all_tests, some_tests, some_dirs) ) > 0 :
-                print('ERROR: must have option \'--all\', \'--list\', \'--include\', \'-I\' or non-empty test list', file=sys.stderr)
+                print('''ERROR: must have option '--all', '--list', '--include', '-I' or non-empty test list''', file=sys.stderr)
                 parser.print_help()
                 sys.exit(1)
@@ -189 +188 @@
 # run a single test and handle the errors, outputs, printing, exception handling, etc.
 def run_test_worker(t) :
-
         with SignalHandling():
                 # print formated name
-                name_txt = "%24s  " % t.name
+                name_txt = '{0:{width}}  '.format(t.target(), width=settings.width)
 
                 retcode, error, duration = run_single_test(t)
@@ -281 +279 @@
         elif options.list :
                 print("Listing for %s:%s"% (settings.arch.string, settings.debug.string))
-                fancy_print("\n".join(map(lambda t: "%s" % (t.toString()), tests)))
+                fancy_print("\n".join(map(lambda t: t.toString(), tests)))
 
         else :
                 # check the build configuration works
+                settings.prep_output(tests)
                 settings.validate()