Changes in tests/pybin/settings.py [136f86b:64cf022]

File:

• tests/pybin/settings.py (modified) (4 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))]