Changes in / [f7e4f8e8:0ab3b73]

Files:

• configure.ac (modified) (1 diff)
• tests/config.py.in (modified) (1 diff)
• tests/pybin/settings.py (modified) (3 diffs)
• tests/pybin/tools.py (modified) (1 diff)
• tests/test.py (modified) (3 diffs)

configure.ac

@@ -28 +28 @@
 # New AST toggling support
 AH_TEMPLATE([CFA_USE_NEW_AST],[Sets whether or not to use the new-ast, this is adefault value and can be overrided by --old-ast and --new-ast])
+DEFAULT_NEW_AST="False"
 AC_ARG_ENABLE(new-ast,
         [  --enable-new-ast     whether or not to use new ast as the default AST algorithm],
         [case "${enableval}" in
-                yes) newast=true ;;
-                no)  newast=false ;;
+                yes) newast=true ; DEFAULT_NEW_AST="True"  ;;
+                no)  newast=false; DEFAULT_NEW_AST="False" ;;
                 *) AC_MSG_ERROR([bad value ${enableval} for --enable-new-ast]) ;;
         esac],[newast=false])
 AC_DEFINE_UNQUOTED([CFA_USE_NEW_AST], $newast)
+AC_SUBST(DEFAULT_NEW_AST)
 
 #==============================================================================

tests/config.py.in

@@ -9 +9 @@
 HOSTARCH = "@host_cpu@"
 DISTRIBUTE = @HAS_DISTCC@
+NEWAST = @DEFAULT_NEW_AST@

tests/pybin/settings.py

@@ -98 +98 @@
                 self.path   = "debug" if value else "nodebug"
 
+class AST:
+        def __init__(self, ast):
+                if ast == "new":
+                        self.string = "New AST"
+                        self.flags  = """AST_FLAGS=-XCFA,--new-ast"""
+                elif ast == "old":
+                        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.flags  = """AST_FLAGS="""
+                else:
+                        print("""ERROR: Invalid ast configuration, must be "old", "new" or left unspecified, was %s""" % (value), file=sys.stderr)
+
 class Install:
         def __init__(self, value):
@@ -120 +134 @@
 
 def init( options ):
+        global all_ast
         global all_arch
         global all_debug
         global all_install
+        global ast
         global arch
+        global debug
         global archive
+        global install
+
         global continue_
-        global debug
         global dry_run
         global generating
-        global install
         global make
         global output_width
@@ -135 +152 @@
         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  ))]

tests/pybin/tools.py

@@ -181 +181 @@
                 '-s' if silent else None,
                 test_param,
+                settings.ast.flags,
                 settings.arch.flags,
                 settings.debug.flags,

tests/test.py

@@ -112 +112 @@
         # 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')
         parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=comma_separated(yes_no), default='no')
-        parser.add_argument('--arch', help='Test for specific architecture', type=comma_separated(str), default=None)
         parser.add_argument('--continue', help='When multiple specifications are passed (debug/install/arch), sets whether or not to continue if the last specification failed', type=yes_no, default='yes', dest='continue_')
         parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=120)
@@ -362 +363 @@
                 # for each build configurations, run the test
                 with Timed() as total_dur:
-                        for arch, debug, install in itertools.product(settings.all_arch, settings.all_debug, settings.all_install):
+                        for ast, arch, debug, install in itertools.product(settings.all_ast, settings.all_arch, settings.all_debug, settings.all_install):
+                                settings.ast     = ast
                                 settings.arch    = arch
                                 settings.debug   = debug
@@ -377 +379 @@
 
                                 # print configuration
-                                print('%s %i tests on %i cores (%s:%s)' % (
+                                print('%s %i tests on %i cores (%s:%s - %s)' % (
                                         'Regenerating' if settings.generating else 'Running',
                                         len(local_tests),
                                         options.jobs,
                                         settings.arch.string,
-                                        settings.debug.string
+                                        settings.debug.string,
+                                        settings.ast.string
                                 ))