Changes in / [a3f5208a:4406887]

Location:

tests

Files:

• .expect/castError.oast.txt (deleted)
• .expect/castError.txt (added)
• meta/.expect/archVast.nast.arm64.txt (deleted)
• meta/.expect/archVast.nast.x64.txt (deleted)
• meta/.expect/archVast.nast.x86.txt (deleted)
• meta/.expect/archVast.oast.arm64.txt (deleted)
• meta/.expect/archVast.oast.x64.txt (deleted)
• meta/.expect/archVast.oast.x86.txt (deleted)
• meta/archVast.cfa (deleted)
• pybin/settings.py (modified) (2 diffs)
• pybin/test_run.py (modified) (3 diffs)
• test.py (modified) (5 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
@@ -100 +101 @@
         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.string = "Default AST (%s)" % ("new" if config.NEWAST else "old")
                         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} arch, {:s} ast: {:s})".format( self.name, self.arch if self.arch else "Any", self.astv if self.astv else "Any", self.target() )
+                return "{:25s} ({:5s} {:s})".format( self.name, self.arch if self.arch else "Any", self.target() )
 
         def prepare(self):
@@ -21 +20 @@
 
         def expect(self):
-                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)) )
+                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)) )
 
         def error_log(self):
@@ -48 +45 @@
 
         @staticmethod
-        def new_target(target, arch, astv):
+        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 = arch.target if arch else ''
-                test.astv = astv.target if astv else ''
                 return test
 

tests/test.py

@@ -24 +24 @@
 
         def match_test(path):
-                match = re.search("^%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.nast|\.oast)?(\.[\w\-_]+)?\.txt$" % settings.SRCDIR, path)
+                match = re.search("^%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt$" % settings.SRCDIR, path)
                 if match :
                         test = Test()
                         test.name = match.group(2)
                         test.path = match.group(1)
-                        test.arch = match.group(4)[1:] if match.group(4) else None
-
-                        astv = match.group(3)[1:] if match.group(3) else None
-                        if astv == 'oast':
-                                test.astv = 'old'
-                        elif astv == 'nast':
-                                test.astv = 'new'
-                        elif astv:
-                                print('ERROR: "%s", expect file has astv but it is not "nast" or "oast"' % testname, file=sys.stderr)
-                                sys.exit(1)
-
+                        test.arch = match.group(3)[1:] if match.group(3) else None
                         expected.append(test)
 
@@ -76 +66 @@
         if options.regenerate_expected :
                 for testname in options.tests :
-                        testname = os.path.normpath( os.path.join(settings.SRCDIR, testname) )
-
+                        testname = canonical_path( testname )
                         # first check if this is a valid name to regenerate
                         if Test.valid_name(testname):
                                 # this is a valid name, let's check if it already exists
                                 found = [test for test in all_tests if canonical_path( test.target() ) == testname]
-                                setup = itertools.product(settings.all_arch if options.arch else [None], settings.all_ast if options.ast else [None])
                                 if not found:
-                                        # it's a new name, create it according to the name and specified architecture/ast version
-                                        tests.extend( [Test.new_target(testname, arch, ast) for arch, ast in setup] )
+                                        # it's a new name, create it according to the name and specified architecture
+                                        if options.arch:
+                                                # user specified one or multiple architectures, assume the tests will have architecture specific results
+                                                tests.extend( [Test.new_target(testname, arch) for arch in settings.all_arch] )
+                                        else:
+                                                # user didn't specify an architecture, just create a cross platform test
+                                                tests.append( Test.new_target( testname, None ) )
                                 elif len(found) == 1 and not found[0].arch:
                                         # we found a single test, the user better be wanting to create a cross platform test
                                         if options.arch:
                                                 print('ERROR: "%s", test has no specified architecture but --arch was specified, ignoring it' % testname, file=sys.stderr)
-                                        elif options.ast:
-                                                print('ERROR: "%s", test has no specified ast version but --ast was specified, ignoring it' % testname, file=sys.stderr)
                                         else:
                                                 tests.append( found[0] )
                                 else:
                                         # this test is already cross platform, just add a test for each platform the user asked
-                                        tests.extend( [Test.new_target(testname, arch, ast) for arch, ast in setup] )
+                                        tests.extend( [Test.new_target(testname, arch) for arch in settings.all_arch] )
 
                                         # print a warning if it users didn't ask for a specific architecture
                                         if not options.arch:
                                                 print('WARNING: "%s", test has architecture specific expected files but --arch was not specified, regenerating only for current host' % testname, file=sys.stderr)
-
-
-                                        # print a warning if it users didn't ask for a specific ast version
-                                        if not options.ast:
-                                                print('WARNING: "%s", test has ast version specific expected files but --ast was not specified, regenerating only for current ast' % testname, file=sys.stderr)
 
                         else :
@@ -266 +252 @@
         except KeyboardInterrupt:
                 return False, ""
-        # except Exception as ex:
-        #       print("Unexpected error in worker thread running {}: {}".format(t.target(), ex), file=sys.stderr)
-        #       sys.stderr.flush()
-        #       return False, ""
+        except Exception as ex:
+                print("Unexpected error in worker thread running {}: {}".format(t.target(), ex), file=sys.stderr)
+                sys.stderr.flush()
+                return False, ""
 
 
@@ -385 +371 @@
                                 # filter out the tests for a different architecture
                                 # tests are the same across debug/install
-                                local_tests = settings.ast.filter( tests )
-                                local_tests = settings.arch.filter( local_tests )
+                                local_tests = settings.arch.filter( tests )
                                 options.jobs, forceJobs = job_count( options, local_tests )
                                 settings.update_make_cmd(forceJobs, options.jobs)
@@ -398 +383 @@
                                         len(local_tests),
                                         options.jobs,
-                                        settings.ast.string,
                                         settings.arch.string,
-                                        settings.debug.string
+                                        settings.debug.string,
+                                        settings.ast.string
                                 ))
-                                if not local_tests :
-                                        print('WARNING: No tests for this configuration')
-                                        continue
 
                                 # otherwise run all tests and make sure to return the correct error code