Changeset 209383b

Timestamp:

Dec 4, 2017, 6:10:25 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

099a40d

Parents:

bacc36c

Message:

Tests: moved debug flags to settings to eliminate parameters and functools

Location:

src/tests

Files:

• pybin/settings.py (modified) (2 diffs)
• pybin/tools.py (modified) (1 diff)
• test.py (modified) (11 diffs)

src/tests/pybin/settings.py

@@ -17 +17 @@
         global generating
         global make
+        global debug
+        global debugFlag
 
         arch       = Architecture(options.arch)
@@ -22 +24 @@
         generating = options.regenerate_expected
         make       = './make_command_not_initialized'
+        debug        = "debug" if options.debug else "no debug"
+        debugFlag  = """DEBUG_FLAGS="%s" """ % ("-debug" if debug else "-nodebug")
 
 def updateMakeCmd(force, jobs):

src/tests/pybin/tools.py

@@ -76 +76 @@
                 '-s' if silent else '',
                 test_param,
+                settings.debugFlag,
                 flags,
                 target,

src/tests/test.py

@@ -7 +7 @@
 
 import argparse
-import functools
 import re
 import sys
@@ -15 +14 @@
 ################################################################################
 
-def list_expected():
+def findTests():
         expected = []
 
@@ -37 +36 @@
 
         # tests directly in the .expect folder will always be processed
-        test_list = list_expected()
+        test_list = findTests()
 
         # if we have a limited number of includes, filter by them
@@ -120 +119 @@
 ################################################################################
 # logic to run a single test and return the result (No handling of printing or other test framework logic)
-def run_single_test(test, debug):
+def run_single_test(test):
 
         # find the output file based on the test name and options flag
@@ -134 +133 @@
         rm( (out_file, err_file, test.target()) )
 
-        options = "-debug" if debug else "-nodebug"
-
         # build, skipping to next test on error
         make_ret, _ = make( test.target(),
-                flags      = """DEBUG_FLAGS="%s" """ % options,
                 redirects  = "2> %s 1> /dev/null" % out_file,
                 error_file = err_file
@@ -180 +176 @@
 
 # run a single test and handle the errors, outputs, printing, exception handling, etc.
-def run_test_worker(t, debug) :
+def run_test_worker(t) :
 
         with SignalHandling():
@@ -186 +182 @@
                 name_txt = "%20s  " % t.name
 
-                retcode, error = run_single_test(t, debug)
+                retcode, error = run_single_test(t)
 
                 # update output based on current action
@@ -205 +201 @@
 
 # run the given list of tests with the given parameters
-def run_tests(tests, jobs, debug) :
+def run_tests(tests, jobs) :
         # clean the sandbox from previous commands
         make('clean', redirects = '> /dev/null 2>&1')
@@ -215 +211 @@
         try :
                 results = pool.map_async(
-                        functools.partial(run_test_worker, debug=debug),
+                        run_test_worker,
                         tests,
                         chunksize = 1
@@ -267 +263 @@
 
         elif options.list :
-                print("Listing for %s:%s"% (settings.arch.toString(), "debug" if options.debug else "no debug"))
+                print("Listing for %s:%s"% (settings.arch.toString(), settings.debug))
                 print("\n".join(map(lambda t: "%s" % (t.toString()), tests)))
 
@@ -277 +273 @@
                         'Regenerate tests' if settings.generating else 'Running',
                         settings.arch.toString(),
-                        "debug" if options.debug else "no debug",
+                        settings.debug,
                         options.jobs
                 ))
 
                 # otherwise run all tests and make sure to return the correct error code
-                sys.exit( run_tests(tests, options.jobs, options.debug) )
+                sys.exit( run_tests(tests, options.jobs) )