Changeset 692e6f1

Timestamp:

Apr 18, 2020, 9:08:18 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

66f3bae

Parents:

76e2113 (diff), 64cf022 (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

Files:

• pybin/settings.py (modified) (2 diffs)
• pybin/test_run.py (modified) (2 diffs)
• test.py (modified) (1 diff)

tests/pybin/settings.py

@@ -81 +81 @@
                 return True if not arch else self.target == arch
 
-        @classmethod
-        def make_canonical(_, arch):
+        @staticmethod
+        def make_canonical(arch):
                 return Architecture.KnownArchitectures[arch]
 
@@ -105 +105 @@
                 self.total  = Timeouts.check(tg)
 
-        @classmethod
-        def check(_, value):
+        @staticmethod
+        def check(value):
                 if value < 1:
                         print("Timeouts must be at least 1 second", file=sys.stderr)

tests/pybin/test_run.py

@@ -40 +40 @@
                 return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, self.name) )
 
-        @classmethod
-        def valid_name(_, name):
+        @staticmethod
+        def valid_name(name):
                 return not name.endswith( ('.c', '.cc', '.cpp', '.cfa') )
 
-        @classmethod
-        def new_target(_, target, arch):
+        @staticmethod
+        def new_target(target, arch):
                 test = Test()
                 test.name = os.path.basename(target)
@@ -72 +72 @@
                 return text
 
-        @classmethod
-        def fmtDur( cls, duration ):
+        @staticmethod
+        def fmtDur( duration ):
                 if duration :
                         hours, rem = divmod(duration, 3600)

tests/test.py

@@ -243 +243 @@
                 return False, ""
         except Exception as ex:
-                print("Unexpected error in worker thread: %s" % ex, file=sys.stderr)
+                print("Unexpected error in worker thread running {}: {}".format(t.target(), ex), file=sys.stderr)
                 sys.stderr.flush()
                 return False, ""