Index: tests/config.py.in =================================================================== --- tests/config.py.in (revision 4dba1da9761c2530e2a153b05a7e9cf84f15613c) +++ tests/config.py.in (revision 597e39516ffabaca438ac850b11c1496c54c30e7) @@ -9,3 +9,2 @@ HOSTARCH = "@host_cpu@" DISTRIBUTE = @HAS_DISTCC@ -NEWAST = @DEFAULT_NEW_AST@ Index: tests/pybin/settings.py =================================================================== --- tests/pybin/settings.py (revision 4dba1da9761c2530e2a153b05a7e9cf84f15613c) +++ tests/pybin/settings.py (revision 597e39516ffabaca438ac850b11c1496c54c30e7) @@ -97,26 +97,4 @@ 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 = """""" - elif ast == "old": - self.target = ast - self.string = "Old AST" - self.flags = """""" - elif ast == None: - self.target = "new" if config.NEWAST else "old" - self.string = "Default AST (%s)" % self.target - self.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,9 +119,7 @@ def init( options ): - global all_ast global all_arch global all_debug global all_install - global ast global arch global debug @@ -160,5 +136,4 @@ 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 ))] Index: tests/pybin/test_run.py =================================================================== --- tests/pybin/test_run.py (revision 4dba1da9761c2530e2a153b05a7e9cf84f15613c) +++ tests/pybin/test_run.py (revision 597e39516ffabaca438ac850b11c1496c54c30e7) @@ -11,8 +11,7 @@ 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} arch: {:s})".format( self.name, self.arch if self.arch else "Any", self.target() ) def prepare(self): @@ -22,6 +21,5 @@ 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,arch)) ) def error_log(self): @@ -58,10 +56,9 @@ @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 Index: tests/pybin/tools.py =================================================================== --- tests/pybin/tools.py (revision 4dba1da9761c2530e2a153b05a7e9cf84f15613c) +++ tests/pybin/tools.py (revision 597e39516ffabaca438ac850b11c1496c54c30e7) @@ -182,5 +182,4 @@ '-s' if silent else None, test_param, - settings.ast.flags, settings.arch.flags, settings.debug.flags, Index: tests/test.py =================================================================== --- tests/test.py (revision 4dba1da9761c2530e2a153b05a7e9cf84f15613c) +++ tests/test.py (revision 597e39516ffabaca438ac850b11c1496c54c30e7) @@ -23,19 +23,10 @@ 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) @@ -81,19 +72,17 @@ # 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]) + setup = itertools.product(settings.all_arch if options.arch 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 + tests.extend( [Test.new_target(testname, arch) for arch in setup] ) 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 setup] ) # print a warning if it users didn't ask for a specific architecture @@ -102,10 +91,4 @@ 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 - found_astv = [f.astv for f in found if f.astv] - if found_astv and 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 : print('ERROR: "%s", tests are not allowed to end with a C/C++/CFA extension, ignoring it' % testname, file=sys.stderr) @@ -127,5 +110,4 @@ # create a parser with the arguments for the tests script parser = argparse.ArgumentParser(description='Script which runs cforall tests') - parser.add_argument('--ast', help='Test for specific ast', type=comma_separated(str), default=None) parser.add_argument('--arch', help='Test for specific architecture', type=comma_separated(str), default=None) parser.add_argument('--debug', help='Run all tests in debug or release', type=comma_separated(yes_no), default='yes') @@ -422,6 +404,5 @@ # for each build configurations, run the test with Timed() as total_dur: - for ast, arch, debug, install in itertools.product(settings.all_ast, settings.all_arch, settings.all_debug, settings.all_install): - settings.ast = ast + for arch, debug, install in itertools.product(settings.all_arch, settings.all_debug, settings.all_install): settings.arch = arch settings.debug = debug @@ -430,6 +411,5 @@ # 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 ) # check the build configuration works @@ -438,9 +418,8 @@ # print configuration - print('%s %i tests on %i cores (%s:%s - %s)' % ( + print('%s %i tests on %i cores (%s - %s)' % ( 'Regenerating' if settings.generating else 'Running', len(local_tests), jobs, - settings.ast.string, settings.arch.string, settings.debug.string