Changes in tests/pybin/test_run.py [a2f2fda:f9128a5]

File:

• tests/pybin/test_run.py (modified) (4 diffs)

tests/pybin/test_run.py

@@ -11 +11 @@
                 self.path = ''
                 self.arch = ''
-                self.astv = ''
 
         def toString(self):
-                return "{:25s} ({:5s} arch, {:s} ast: {:s})".format( self.name, self.arch if self.arch else "Any", self.astv if self.astv else "Any", self.target() )
+                return "{:25s} ({:5s} {:s})".format( self.name, self.arch if self.arch else "Any", self.target() )
 
         def prepare(self):
@@ -21 +20 @@
 
         def expect(self):
-                arch = '' if not self.arch else ".%s" % self.arch
-                astv = '' if not self.astv else ".nast" if self.astv == "new" else ".oast"
-                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".expect", "%s%s%s.txt" % (self.name,astv,arch)) )
+                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".expect", "%s%s.txt" % (self.name,'' if not self.arch else ".%s" % self.arch)) )
 
         def error_log(self):
@@ -43 +40 @@
                 return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, self.name) )
 
-        @staticmethod
-        def valid_name(name):
+        @classmethod
+        def valid_name(_, name):
                 return not name.endswith( ('.c', '.cc', '.cpp', '.cfa') )
 
-        @staticmethod
-        def new_target(target, arch, astv):
+        @classmethod
+        def from_target(_, target):
                 test = Test()
                 test.name = os.path.basename(target)
                 test.path = os.path.relpath (os.path.dirname(target), settings.SRCDIR)
-                test.arch = arch.target if arch else ''
-                test.astv = astv.target if astv else ''
+                test.arch = settings.arch.target if settings.arch.cross_compile else ''
                 return test
 
@@ -73 +69 @@
                         else :                                          text = "FAILED with code %d" % retcode
 
-                text += "    C%s - R%s" % (fmtDur(duration[0]), fmtDur(duration[1]))
+                text += "    C%s - R%s" % (cls.fmtDur(duration[0]), cls.fmtDur(duration[1]))
                 return text
+
+        @classmethod
+        def fmtDur( cls, duration ):
+                if duration :
+                        hours, rem = divmod(duration, 3600)
+                        minutes, rem = divmod(rem, 60)
+                        seconds, millis = divmod(rem, 1)
+                        return "%2d:%02d.%03d" % (minutes, seconds, millis * 1000)
+                return " n/a"