Changeset 23a08aa0 for tests/pybin/settings.py

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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:

fix merge conflict

File:

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

tests/pybin/settings.py

@@ -97 +97 @@
                 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:
         def __init__(self, value):
@@ -141 +119 @@
 
 def init( options ):
-        global all_ast
         global all_arch
         global all_debug
         global all_install
-        global ast
         global arch
         global debug
@@ -160 +136 @@
         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  ))]