Changes in tests/pybin/settings.py [a2f2fda:abec2f8]

File:

• tests/pybin/settings.py (modified) (6 diffs)

tests/pybin/settings.py

@@ -23 +23 @@
 class Architecture:
         KnownArchitectures = {
-                'x64'         : 'x64',
-                'x86-64'      : 'x64',
-                'x86_64'      : 'x64',
-                'x86'         : 'x86',
-                'aarch64'     : 'arm64',
-                'arm64'       : 'arm64',
-                'ARM64'       : 'arm64',
-                'i386'        : 'x86',
-                'i486'        : 'x86',
-                'i686'        : 'x86',
-                'Intel 80386' : 'x86',
-                'arm'         : 'arm32',
-                'ARM'         : 'arm32',
-                'arm32'       : 'arm32',
-                'ARM32'       : 'arm32',
+                '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',
         }
 
         CrossCompileFlags = {
-                'x64'  : 'ARCH_FLAGS=-m64',
-                'x86'  : 'ARCH_FLAGS=-m32',
-                'arm64': 'ARCH_FLAGS=',
-                'arm32': 'ARCH_FLAGS=',
+                'x64' : 'ARCH_FLAGS=-m64',
+                'x86' : 'ARCH_FLAGS=-m32',
         }
 
@@ -83 +77 @@
                         print("updated to %s" % self.target)
 
-        def filter(self, tests):
-                return [test for test in tests if not test.arch or self.target == test.arch]
+        def match(self, arch):
+                return True if not arch else self.target == arch
 
-        @staticmethod
-        def make_canonical(arch):
+        @classmethod
+        def make_canonical(_, arch):
                 return Architecture.KnownArchitectures[arch]
 
@@ -96 +90 @@
                 self.flags  = """DEBUG_FLAGS=%s""" % ("-debug -O0" if value else "-nodebug -O2")
                 self.path   = "debug" if value else "nodebug"
-
-class AST:
-        def __init__(self, ast):
-                if ast == "new":
-                        self.target = ast
-                        self.string = "New AST"
-                        self.flags  = """AST_FLAGS=-XCFA,--new-ast"""
-                elif ast == "old":
-                        self.target = ast
-                        self.string = "Old AST"
-                        self.flags  = """AST_FLAGS=-XCFA,--old-ast"""
-                elif ast == None:
-                        self.target = "new" if config.NEWAST else "old"
-                        self.string = "Default AST (%s)" % self.target
-                        self.flags  = """AST_FLAGS="""
-                else:
-                        print("""ERROR: Invalid ast configuration, must be "old", "new" or left unspecified, was %s""" % (value), file=sys.stderr)
-                        sys.exit(1)
-
-        def filter(self, tests):
-
-                return [test for test in tests if not test.astv or self.target == test.astv]
 
 class Install:
@@ -132 +104 @@
                 self.total  = Timeouts.check(tg)
 
-        @staticmethod
-        def check(value):
+        @classmethod
+        def check(_, value):
                 if value < 1:
                         print("Timeouts must be at least 1 second", file=sys.stderr)
@@ -141 +113 @@
 
 def init( options ):
-        global all_ast
-        global all_arch
-        global all_debug
-        global all_install
-        global ast
         global arch
+        global archive
         global debug
-        global archive
-        global install
-
-        global continue_
+        global distcc
         global dry_run
         global generating
+        global install
         global make
         global output_width
         global timeout
-        global timeout2gdb
 
-        all_ast      = [AST(o)          for o in list(dict.fromkeys(options.ast    ))] if options.ast  else [AST(None)]
-        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))]
+        arch         = Architecture(options.arch)
         archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
-        continue_    = options.continue_
+        debug        = Debug(options.debug)
         dry_run      = options.dry_run # must be called before tools.config_hash()
+        distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
         generating   = options.regenerate_expected
+        install      = Install(options.install)
         make         = ['make']
         output_width = 24
         timeout      = Timeouts(options.timeout, options.global_timeout)
-        timeout2gdb  = options.timeout_with_gdb
 
         # if we distribute, distcc errors will fail tests, use log file for distcc
@@ -183 +146 @@
 
 def validate():
-        """Validate the current configuration and update globals"""
-
-        global distcc
-        distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
         errf = os.path.join(BUILDDIR, ".validate.err")
         make_ret, out = tools.make( ".validate", error_file = errf, output_file=subprocess.DEVNULL, error=subprocess.DEVNULL )