Changeset 692e6f1


Ignore:
Timestamp:
Apr 18, 2020, 9:08:18 AM (18 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
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:
3 edited

Legend:

Unmodified
Added
Removed
  • tests/pybin/settings.py

    r76e2113 r692e6f1  
    8181                return True if not arch else self.target == arch
    8282
    83         @classmethod
    84         def make_canonical(_, arch):
     83        @staticmethod
     84        def make_canonical(arch):
    8585                return Architecture.KnownArchitectures[arch]
    8686
     
    105105                self.total  = Timeouts.check(tg)
    106106
    107         @classmethod
    108         def check(_, value):
     107        @staticmethod
     108        def check(value):
    109109                if value < 1:
    110110                        print("Timeouts must be at least 1 second", file=sys.stderr)
  • tests/pybin/test_run.py

    r76e2113 r692e6f1  
    4040                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, self.name) )
    4141
    42         @classmethod
    43         def valid_name(_, name):
     42        @staticmethod
     43        def valid_name(name):
    4444                return not name.endswith( ('.c', '.cc', '.cpp', '.cfa') )
    4545
    46         @classmethod
    47         def new_target(_, target, arch):
     46        @staticmethod
     47        def new_target(target, arch):
    4848                test = Test()
    4949                test.name = os.path.basename(target)
     
    7272                return text
    7373
    74         @classmethod
    75         def fmtDur( cls, duration ):
     74        @staticmethod
     75        def fmtDur( duration ):
    7676                if duration :
    7777                        hours, rem = divmod(duration, 3600)
  • tests/test.py

    r76e2113 r692e6f1  
    243243                return False, ""
    244244        except Exception as ex:
    245                 print("Unexpected error in worker thread: %s" % ex, file=sys.stderr)
     245                print("Unexpected error in worker thread running {}: {}".format(t.target(), ex), file=sys.stderr)
    246246                sys.stderr.flush()
    247247                return False, ""
Note: See TracChangeset for help on using the changeset viewer.