Changeset a2f2fda for tests/pybin

Timestamp:

Nov 3, 2020, 5:29:45 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

a3f5208a

Parents:

daefe93

Message:

Finished support for running tests for new and old ast

Location:

tests/pybin

Files:

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

tests/pybin/settings.py

@@ -85 +85 @@
         def filter(self, tests):
                 return [test for test in tests if not test.arch or self.target == test.arch]
-                return True if not arch else self.target == arch
 
         @staticmethod
@@ -101 +100 @@
         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.string = "Default AST (%s)" % ("new" if config.NEWAST else "old")
+                        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:

tests/pybin/test_run.py

@@ -11 +11 @@
                 self.path = ''
                 self.arch = ''
+                self.astv = ''
 
         def toString(self):
-                return "{:25s} ({:5s} {:s})".format( self.name, self.arch if self.arch else "Any", self.target() )
+                return "{:25s} ({:5s} arch, {:s} ast: {:s})".format( self.name, self.arch if self.arch else "Any", self.astv if self.astv else "Any", self.target() )
 
         def prepare(self):
@@ -20 +21 @@
 
         def expect(self):
-                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".expect", "%s%s.txt" % (self.name,'' if not self.arch else ".%s" % self.arch)) )
+                arch = '' if not self.arch else ".%s" % self.arch
+                astv = '' if not self.astv else ".nast" if self.astv == "new" else ".oast"
+                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".expect", "%s%s%s.txt" % (self.name,astv,arch)) )
 
         def error_log(self):
@@ -45 +48 @@
 
         @staticmethod
-        def new_target(target, arch):
+        def new_target(target, arch, astv):
                 test = Test()
                 test.name = os.path.basename(target)
                 test.path = os.path.relpath (os.path.dirname(target), settings.SRCDIR)
                 test.arch = arch.target if arch else ''
+                test.astv = astv.target if astv else ''
                 return test