Changeset 3a32b3a for tests/pybin

Timestamp:

Jul 10, 2020, 11:42:41 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

20ab637, 2fc94ced, fb98462

Parents:

732b406 (diff), 49cad912 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests/pybin

Files:

• test_run.py (modified) (1 diff)
• tools.py (modified) (1 diff)

tests/pybin/test_run.py

@@ -69 +69 @@
                         else :                                          text = "FAILED with code %d" % retcode
 
-                text += "    C%s - R%s" % (cls.fmtDur(duration[0]), cls.fmtDur(duration[1]))
+                text += "    C%s - R%s" % (fmtDur(duration[0]), fmtDur(duration[1]))
                 return text
-
-        @staticmethod
-        def fmtDur( 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"

tests/pybin/tools.py

@@ -387 +387 @@
                 while True:
                         yield i.next(max(expire - time.time(), 0))
+
+def fmtDur( 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"