Changeset bcd74f3 for tests/pybin

Timestamp:

May 8, 2020, 4:44:53 PM (6 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, stuck-waitfor-destruct

Children:

5c9b20c

Parents:

e3bc51c (diff), 0e7e3c17 (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' into new-ast

Location:

tests/pybin

Files:

• settings.py (modified) (4 diffs)
• test_run.py (modified) (2 diffs)

tests/pybin/settings.py

@@ -23 +23 @@
 class Architecture:
         KnownArchitectures = {
-                'x64'           : 'x64',
-                'x86-64'        : 'x64',
-                'x86_64'        : 'x64',
-                'x86'           : 'x86',
-                'aarch64'       : 'arm',
-                'i386'          : 'x86',
-                'i486'          : 'x86',
-                'i686'          : 'x86',
-                'Intel 80386'   : 'x86',
-                'arm'           : 'arm',
-                'ARM'           : 'arm',
+                'x64'         : 'x64',
+                'x86-64'      : 'x64',
+                'x86_64'      : 'x64',
+                'x86'         : 'x86',
+                'aarch64'     : 'arm',
+                'i386'        : 'x86',
+                'i486'        : 'x86',
+                'i686'        : 'x86',
+                'Intel 80386' : 'x86',
+                'arm'         : 'arm',
+                'ARM'         : 'arm',
         }
 
@@ -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)
@@ -129 +129 @@
         global timeout2gdb
 
-        all_arch     = [Architecture(o) for o in list(dict.fromkeys(options.arch   ))]
+        all_arch     = [Architecture(o) for o in list(dict.fromkeys(options.arch   ))] if options.arch else [Architecture(None)]
         all_debug    = [Debug(o)        for o in list(dict.fromkeys(options.debug  ))]
         all_install  = [Install(o)      for o in list(dict.fromkeys(options.install))]

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 from_target(_, target):
+        @staticmethod
+        def new_target(target, arch):
                 test = Test()
                 test.name = os.path.basename(target)
                 test.path = os.path.relpath (os.path.dirname(target), settings.SRCDIR)
-                test.arch = settings.arch.target if settings.arch.cross_compile else ''
+                test.arch = arch.target if arch else ''
                 return test
 
@@ -72 +72 @@
                 return text
 
-        @classmethod
-        def fmtDur( cls, duration ):
+        @staticmethod
+        def fmtDur( duration ):
                 if duration :
                         hours, rem = divmod(duration, 3600)